diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-28 09:53:09 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-28 09:53:09 +0000 |
| commit | 5f5fc69dde0d7098b72b047090c8a4f56d495002 (patch) | |
| tree | f052766733d7a79a4260ce5edc2298e52757df0d | |
| parent | 0a43b25c20010b3eb4c9ab8cef8712df99702fac (diff) | |
| parent | 6123e1db830de0d753228f4d3a44e95ff6d0f393 (diff) | |
| download | gitlab-ce-5f5fc69dde0d7098b72b047090c8a4f56d495002.tar.gz | |
Merge branch '46846-update-redis-namespace-to-1-6-0' into 'master'
Update redis-namespace to 1.6.0
Closes #46846
See merge request gitlab-org/gitlab-ce!19166
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/46846-update-redis-namespace-to-1-6-0.yml | 5 |
3 files changed, 9 insertions, 4 deletions
@@ -162,7 +162,7 @@ gem 'acts-as-taggable-on', '~> 5.0' # Background jobs gem 'sidekiq', '~> 5.1' gem 'sidekiq-cron', '~> 0.6.0' -gem 'redis-namespace', '~> 1.5.2' +gem 'redis-namespace', '~> 1.6.0' gem 'sidekiq-limit_fetch', '~> 3.4', require: false # Cron Parser diff --git a/Gemfile.lock b/Gemfile.lock index 537c377dccc..2d928b6a826 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -709,8 +709,8 @@ GEM redis-activesupport (5.0.4) activesupport (>= 3, < 6) redis-store (>= 1.3, < 2) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) + redis-namespace (1.6.0) + redis (>= 3.0.4) redis-rack (2.0.4) rack (>= 1.5, < 3) redis-store (>= 1.2, < 2) @@ -1129,7 +1129,7 @@ DEPENDENCIES recaptcha (~> 3.0) redcarpet (~> 3.4) redis (~> 3.2) - redis-namespace (~> 1.5.2) + redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) diff --git a/changelogs/unreleased/46846-update-redis-namespace-to-1-6-0.yml b/changelogs/unreleased/46846-update-redis-namespace-to-1-6-0.yml new file mode 100644 index 00000000000..3707ad74b8f --- /dev/null +++ b/changelogs/unreleased/46846-update-redis-namespace-to-1-6-0.yml @@ -0,0 +1,5 @@ +--- +title: Update redis-namespace to 1.6.0 +merge_request: 19166 +author: Takuya Noguchi +type: other |