Merge branch 'ruby-2-1-8' into 'master'
Update ruby to 2.1.8 and git to 2.6.2 Fixes #1045 See merge request !597
This commit is contained in:
commit
6f1d4204ca
|
@ -45,7 +45,7 @@ install_dir "/opt/gitlab"
|
|||
build_version Omnibus::BuildVersion.new.semver
|
||||
build_iteration Gitlab::BuildIteration.new.build_iteration
|
||||
|
||||
override :ruby, version: '2.1.7'
|
||||
override :ruby, version: '2.1.8', source: { md5: '091b62f0a9796a3c55de2a228a0e6ef3' }
|
||||
override :rubygems, version: 'v2.5.1'
|
||||
override :'chef-gem', version: '12.5.1'
|
||||
override :cacerts, version: '2015.10.28', source: { md5: '6f41fb0f0c4b4695c2a6296892278141' }
|
||||
|
|
|
@ -17,14 +17,14 @@
|
|||
#
|
||||
|
||||
name "git"
|
||||
default_version "2.6.1"
|
||||
default_version "2.6.2"
|
||||
|
||||
dependency "zlib"
|
||||
dependency "openssl"
|
||||
dependency "curl"
|
||||
|
||||
source :url => "https://www.kernel.org/pub/software/scm/git/git-#{version}.tar.gz",
|
||||
:md5 => "4c62ee9c5991fe93d99cf2a6b68397fd"
|
||||
:md5 => "da293290da69f45a86a311ad3cd43dc8"
|
||||
|
||||
relative_path "git-#{version}"
|
||||
|
||||
|
|
Loading…
Reference in New Issue