diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 11:17:51 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 11:17:51 +0000 |
| commit | 76235ee0655011955dba319f03a94a1d013b563e (patch) | |
| tree | 362888879278ba2fe993f0a36274c24e3253c03d | |
| parent | e4b00acd64ea004d3e55114cf4a5e968d5dd18f3 (diff) | |
| parent | 1bc4366755de56e54afb6c3554b0e66845b62bc9 (diff) | |
| download | gitlab-ce-76235ee0655011955dba319f03a94a1d013b563e.tar.gz | |
Merge branch 'sh-bump-sidekiq' into 'master'
Bump Sidekiq and other related gems
See merge request gitlab-org/gitlab-ce!22956
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d111c2cffed..8570fabb72f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -598,7 +598,7 @@ GEM get_process_mem (~> 0.2) puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) - rack (1.6.10) + rack (1.6.11) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) @@ -610,7 +610,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.3) + rack-protection (2.0.4) rack rack-proxy (0.6.0) rack @@ -804,7 +804,7 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.1) + sidekiq (5.2.3) connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 013695e5eae..31f06121884 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -614,7 +614,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.3) + rack-protection (2.0.4) rack rack-proxy (0.6.0) rack @@ -812,7 +812,7 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.1) + sidekiq (5.2.3) connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) |