diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-29 20:00:56 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-29 20:00:56 +0100 |
| commit | 57ca2340edc4664729f3030f1a96081041493f4f (patch) | |
| tree | 706f70e66aeefef1bd946dea454dc014a8701997 /Gemfile.rails4.lock | |
| parent | 0341cfd63efcfee7422f67dd3a83df1cf392740c (diff) | |
| parent | b05a36430404aa8eaeeed8560ed03c18117f6d72 (diff) | |
| download | gitlab-ce-57ca2340edc4664729f3030f1a96081041493f4f.tar.gz | |
Merge branch 'master' into tatkins-installation-method-docs
Diffstat (limited to 'Gemfile.rails4.lock')
| -rw-r--r-- | Gemfile.rails4.lock | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index dd2cd59daae..ea248dfdabe 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -74,9 +74,9 @@ GEM bcrypt (3.1.12) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) - better_errors (2.1.1) + better_errors (2.5.0) coderay (>= 1.0.0) - erubis (>= 2.6.6) + erubi (>= 1.0.0) rack (>= 0.9.0) bindata (2.4.3) binding_of_caller (0.8.0) @@ -180,6 +180,7 @@ GEM mail (~> 2.7) encryptor (3.0.0) equalizer (0.0.11) + erubi (1.7.1) erubis (2.7.0) escape_utils (1.2.1) et-orbi (1.0.3) @@ -271,7 +272,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.123.0) + gitaly-proto (1.2.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-markup (1.6.5) @@ -363,14 +364,14 @@ GEM html2text (0.2.0) nokogiri (~> 1.6) htmlentities (4.3.4) - http (2.2.2) + http (3.3.0) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 1.0.1) + http-form_data (~> 2.0) http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.3) + http-form_data (2.1.1) http_parser.rb (0.6.0) httparty (0.13.7) json (~> 1.8) @@ -414,8 +415,8 @@ GEM kgio (2.10.0) knapsack (1.17.0) rake - kubeclient (3.1.0) - http (~> 2.2.2) + kubeclient (4.0.0) + http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) launchy (2.4.3) @@ -943,7 +944,7 @@ DEPENDENCIES batch-loader (~> 1.2.1) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) - better_errors (~> 2.1.0) + better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) bootsnap (~> 1.3) bootstrap_form (~> 2.7.0) @@ -997,7 +998,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.123.0) + gitaly-proto (~> 1.2.0) github-markup (~> 1.7.0) gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher @@ -1032,7 +1033,7 @@ DEPENDENCIES jwt (~> 1.5.6) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 3.1.0) + kubeclient (~> 4.0.0) letter_opener_web (~> 1.3.0) license_finder (~> 5.4) licensee (~> 8.9) @@ -1078,6 +1079,7 @@ DEPENDENCIES pry-rails (~> 0.3.4) puma (~> 3.12) puma_worker_killer + rack (= 1.6.11) rack-attack (~> 4.4.1) rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) |