gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update_omnibus' into 'master' 

Omnibus version v5.0.0

Fixes #834

See merge request !548
This commit is contained in:
Marin Jankovski 2015-11-26 16:16:13 +00:00
parent cc757be0b1 3254fa4c0a
commit 18835f1445
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Gemfile.lock
View File

@ -7,50 +7,61 @@ GIT
GIT
remote: https://gitlab.com/gitlab-org/omnibus.git
revision: 1b336f7474ac953f10df93df3e2f98ed90dc0687
revision: a20b6cad63d08b5a465362e4f34ac49dbe6f8100
branch: gitlab_omnibus
specs:
omnibus (4.0.0)
omnibus (5.0.0)
aws-sdk (~> 2)
chef-sugar (~> 3.0)
cleanroom (~> 1.0)
mixlib-shellout (~> 1.4)
mixlib-shellout (~> 2.0)
mixlib-versioning
ohai (~> 7.2)
ohai (~> 8.0)
ruby-progressbar (~> 1.7)
thor (~> 0.18)
uber-s3
GEM
remote: https://rubygems.org/
specs:
aws-sdk (2.2.3)
aws-sdk-resources (= 2.2.3)
aws-sdk-core (2.2.3)
jmespath (~> 1.0)
aws-sdk-resources (2.2.3)
aws-sdk-core (= 2.2.3)
chef-config (12.5.1)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
chef-sugar (3.1.1)
cleanroom (1.0.0)
colorize (0.6.0)
diff-lcs (1.2.5)
ffi (1.9.9)
ffi-yajl (1.4.0)
ffi (~> 1.5)
ffi (1.9.10)
ffi-yajl (2.2.2)
libyajl2 (~> 1.2)
highline (1.6.20)
ipaddress (0.8.0)
jmespath (1.1.3)
json (1.8.2)
json_pure (1.8.1)
libyajl2 (1.2.0)
mime-types (1.25.1)
mime-types (2.99)
mixlib-cli (1.5.0)
mixlib-config (2.2.1)
mixlib-log (1.6.0)
mixlib-shellout (1.6.1)
mixlib-shellout (2.2.3)
mixlib-versioning (1.1.0)
ohai (7.4.1)
ohai (8.7.0)
chef-config (>= 12.5.0.alpha.1, < 13)
ffi (~> 1.9)
ffi-yajl (~> 1.1)
ffi-yajl (~> 2.2)
ipaddress
mime-types (~> 1.16)
mime-types (~> 2.0)
mixlib-cli
mixlib-config (~> 2.0)
mixlib-log
mixlib-shellout (~> 1.2)
mixlib-shellout (~> 2.0)
rake (~> 10.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
package_cloud (0.2.18)
@ -59,6 +70,7 @@ GEM
json_pure (= 1.8.1)
rest-client (= 1.6.7)
thor (= 0.18.1)
rake (10.4.2)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (3.2.0)
@ -77,8 +89,6 @@ GEM
ruby-progressbar (1.7.5)
systemu (2.6.5)
thor (0.18.1)
uber-s3 (0.2.4)
mime-types (~> 1.17)
wmi-lite (1.0.0)
PLATFORMS