diff --git a/Gemfile b/Gemfile index f007f281cd43741b1e837f536e35ee062b32e040_R2VtZmlsZQ==..753ca6da5f63264212cbf6b9ed02235c916df4f1_R2VtZmlsZQ== 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ require_relative "lib/gitlab/version" -omnibus_gem_version = Gitlab::Version.new('omnibus', "7.0.10.11") +omnibus_gem_version = Gitlab::Version.new('omnibus', "8.2.1.0") # Note that omnibus is from a fork with additional gitlab changes. You can # check what they are with the following comparison link: diff --git a/Gemfile.lock b/Gemfile.lock index f007f281cd43741b1e837f536e35ee062b32e040_R2VtZmlsZS5sb2Nr..753ca6da5f63264212cbf6b9ed02235c916df4f1_R2VtZmlsZS5sb2Nr 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GIT remote: https://dev.gitlab.org/gitlab/omnibus.git - revision: fc35dfabad596f7bf26f3d99a2ba5230c83e489f - tag: 7.0.10.11 + revision: 2d3be3ad6936d325d0aaf339dc2bdc3f68f517df + tag: 8.2.1.0 specs: @@ -5,4 +5,4 @@ specs: - omnibus (7.0.10) + omnibus (8.2.1) aws-sdk-s3 (~> 1) chef-cleanroom (~> 1.0) @@ -7,7 +7,8 @@ aws-sdk-s3 (~> 1) chef-cleanroom (~> 1.0) - chef-sugar (>= 3.3) + chef-utils (>= 15.4) + contracts (>= 0.16.0, < 0.17.0) ffi-yajl (~> 2.2) license_scout (~> 1.0) mixlib-shellout (>= 2.0, < 4.0) mixlib-versioning @@ -10,8 +11,8 @@ ffi-yajl (~> 2.2) license_scout (~> 1.0) mixlib-shellout (>= 2.0, < 4.0) mixlib-versioning - ohai (>= 13, < 17) + ohai (>= 15, < 17) pedump ruby-progressbar (~> 1.7) thor (>= 0.18, < 2.0) @@ -33,9 +34,9 @@ public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.1.0) - aws-partitions (1.329.0) - aws-sdk-core (3.99.2) + aws-eventstream (1.2.0) + aws-partitions (1.506.0) + aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -43,9 +44,9 @@ aws-sdk-ec2 (1.197.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.38.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-kms (1.48.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-marketplacecatalog (1.7.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) @@ -48,7 +49,7 @@ aws-sigv4 (~> 1.1) aws-sdk-marketplacecatalog (1.7.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.70.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-s3 (1.103.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-kms (~> 1) @@ -54,7 +55,7 @@ aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.4) - aws-eventstream (~> 1.0, >= 1.0.2) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.4.0) + aws-eventstream (~> 1, >= 1.0.2) bcrypt_pbkdf (1.0.1) binding_ninja (0.2.3) builder (3.2.4) @@ -111,7 +112,6 @@ mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-sugar (5.1.12) chef-utils (15.17.4) chef-zero (15.0.3) ffi-yajl (~> 2.2) @@ -130,6 +130,7 @@ adamantium (~> 0.2.0) equalizer (~> 0.0.9) concurrent-ruby (1.1.8) + contracts (0.16.1) cookbook-omnifetch (0.9.1) mixlib-archive (>= 0.4, < 2.0) diff-lcs (1.3) @@ -149,6 +150,6 @@ rspec (~> 3.4) fauxhai-ng (8.7.0) net-ssh - ffi (1.15.3) + ffi (1.15.4) ffi-libarchive (1.0.4) ffi (~> 1.0) @@ -153,7 +154,7 @@ ffi-libarchive (1.0.4) ffi (~> 1.0) - ffi-yajl (2.3.3) - libyajl2 (~> 1.2) + ffi-yajl (2.4.0) + libyajl2 (>= 1.2) fuzzyurl (0.9.0) gitlab (4.17.0) httparty (~> 0.18) @@ -195,9 +196,9 @@ json_pure (1.8.1) knapsack (1.17.1) rake - libyajl2 (1.2.0) + libyajl2 (2.1.0) license-acceptance (1.0.19) pastel (~> 0.7) tomlrb (~> 1.2) tty-box (~> 0.3) tty-prompt (~> 0.18) @@ -199,9 +200,9 @@ license-acceptance (1.0.19) pastel (~> 0.7) tomlrb (~> 1.2) tty-box (~> 0.3) tty-prompt (~> 0.18) - license_scout (1.2.10) + license_scout (1.2.13) ffi-yajl (~> 2.2) mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) @@ -220,6 +221,6 @@ mixlib-archive (1.0.5) mixlib-log mixlib-authentication (3.0.7) - mixlib-cli (2.1.6) - mixlib-config (3.0.6) + mixlib-cli (2.1.8) + mixlib-config (3.0.9) tomlrb @@ -225,6 +226,7 @@ tomlrb - mixlib-log (3.0.8) - mixlib-shellout (3.0.9) + mixlib-log (3.0.9) + mixlib-shellout (3.2.5) + chef-utils mixlib-versioning (1.2.12) molinillo (0.6.6) multi_json (1.14.1) @@ -275,7 +277,7 @@ multipart-post (>= 2.0.0) rainbow zhexdump (>= 0.0.2) - plist (3.5.0) + plist (3.6.0) proc_to_ast (0.1.0) coderay parser @@ -285,7 +287,7 @@ pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (4.0.5) + public_suffix (4.0.6) rack (2.2.3) rainbow (2.2.2) rake @@ -289,7 +291,7 @@ rack (2.2.3) rainbow (2.2.2) rake - rake (13.0.1) + rake (13.0.6) regexp_parser (2.1.1) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0)