diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-03 18:10:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-03 18:10:53 +0300 |
commit | 7fcda12793acc54ba8de037f50cc3696dbd0f002 (patch) | |
tree | 044fbc2b142e6c82ee6b2a5df4b37d000c0e2d1f /Gemfile.lock | |
parent | b5820a6bcd083c878a085aa288757e8dc2d35fec (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5e06975ec87..a70aa8185ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -172,6 +172,14 @@ GEM cbor (0.5.9.6) character_set (1.4.0) charlock_holmes (0.7.7) + chef-config (16.10.17) + addressable + chef-utils (= 16.10.17) + fuzzyurl + mixlib-config (>= 2.2.12, < 4.0) + mixlib-shellout (>= 2.0, < 4.0) + tomlrb (~> 1.2) + chef-utils (16.10.17) childprocess (3.0.0) chunky_png (1.3.5) citrus (3.0.2) @@ -348,6 +356,8 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake + ffi-yajl (2.3.4) + libyajl2 (~> 1.2) flipper (0.17.1) flipper-active_record (0.17.1) activerecord (>= 4.2, < 7) @@ -403,6 +413,7 @@ GEM fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) + fuzzyurl (0.9.0) gemoji (3.0.1) gemojione (3.3.0) json @@ -668,6 +679,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) + libyajl2 (1.2.0) license_finder (6.0.0) bundler rubyzip (>= 1, < 3) @@ -717,6 +729,12 @@ GEM mini_mime (1.0.2) mini_portile2 (2.5.0) minitest (5.11.3) + mixlib-cli (2.1.8) + mixlib-config (3.0.9) + tomlrb + mixlib-log (3.0.9) + mixlib-shellout (3.2.5) + chef-utils ms_rest (0.7.6) concurrent-ruby (~> 1.0) faraday (>= 0.9, < 2.0.0) @@ -741,6 +759,8 @@ GEM connection_pool (~> 2.2) net-ldap (0.16.3) net-ntp (2.1.3) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.0.0) netrc (0.11.0) nio4r (2.5.4) @@ -764,6 +784,19 @@ GEM octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) + ohai (16.10.6) + chef-config (>= 12.8, < 17) + chef-utils (>= 16.0, < 17) + ffi (~> 1.9) + ffi-yajl (~> 2.2) + ipaddress + mixlib-cli (>= 1.7.0) + mixlib-config (>= 2.0, < 4.0) + mixlib-log (>= 2.0.1, < 4.0) + mixlib-shellout (>= 2.0, < 4.0) + plist (~> 3.1) + train-core + wmi-lite (~> 1.0) oj (3.10.6) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) @@ -857,6 +890,7 @@ GEM railties (>= 4.0.0) pg (1.2.3) pg_query (1.3.0) + plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) @@ -1196,9 +1230,17 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) + tomlrb (1.3.0) tpm-key_attestation (0.9.0) bindata (~> 2.4) openssl-signature_algorithm (~> 0.4.0) + train-core (3.4.9) + addressable (~> 2.5) + ffi (!= 1.13.0) + json (>= 1.8, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + net-scp (>= 1.2, < 4.0) + net-ssh (>= 2.9, < 7.0) truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) @@ -1271,6 +1313,7 @@ GEM expression_parser rinku with_env (1.1.0) + wmi-lite (1.0.5) xml-simple (1.1.5) xpath (3.2.0) nokogiri (~> 1.8) @@ -1443,6 +1486,7 @@ DEPENDENCIES nokogiri (~> 1.11.1) oauth2 (~> 1.4) octokit (~> 4.15) + ohai (~> 16.10) oj (~> 3.10.6) omniauth (~> 1.8) omniauth-atlassian-oauth2 (~> 0.2.0) |