diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 00:07:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 00:07:56 +0000 |
| commit | 775816e676aae53509d7b6f364945f2720636f72 (patch) | |
| tree | 0baa821597f08edce720b236b0c07a6d13893f85 /Gemfile.lock | |
| parent | e98d69bc8b8b926a727d36e37d2ee30c9fa28907 (diff) | |
| download | gitlab-ce-775816e676aae53509d7b6f364945f2720636f72.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c1b88ae54fc..989502e40a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -286,6 +286,9 @@ GEM fast_gettext (1.6.0) ffaker (2.10.0) ffi (1.11.3) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake flipper (0.17.1) flipper-active_record (0.17.1) activerecord (>= 4.2, < 7) @@ -493,15 +496,16 @@ GEM html2text (0.2.0) nokogiri (~> 1.6) htmlentities (4.3.4) - http (3.3.0) + http (4.2.0) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) + http-parser (~> 1.2.0) http-cookie (1.0.3) domain_name (~> 0.5) http-form_data (2.1.1) - http_parser.rb (0.6.0) + http-parser (1.2.1) + ffi-compiler (>= 1.0, < 2.0) httparty (0.16.4) mime-types (~> 3.0) multi_xml (>= 0.5.2) @@ -557,8 +561,8 @@ GEM kramdown (2.1.0) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - kubeclient (4.4.0) - http (~> 3.0) + kubeclient (4.6.0) + http (>= 3.0, < 5.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) launchy (2.4.3) @@ -1247,7 +1251,7 @@ DEPENDENCIES jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 4.4.0) + kubeclient (~> 4.6.0) letter_opener_web (~> 1.3.4) license_finder (~> 5.4) licensee (~> 8.9) |