diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-04-24 16:12:14 -0500 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-04-24 21:24:48 -0700 |
| commit | 22c54bf13472470e639babb0a7e16303fc3ca68e (patch) | |
| tree | 5f331ca8a22d4302bef2119b4ad39cf93e694b85 | |
| parent | 080aac050d852c332181a0e3fed7821d52d16c1a (diff) | |
| download | gitlab-ce-sh-upgrade-redis-rb.tar.gz | |
Upgrade redis-rb to remove the use of Timeout.timeoutsh-upgrade-redis-rb
See https://github.com/redis/redis-rb/blob/master/CHANGELOG.md#333
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-upgrade-redis-rb.yml | 4 |
3 files changed, 7 insertions, 3 deletions
@@ -167,7 +167,7 @@ gem 'version_sorter', '~> 2.1.0' gem 'redis-rails', '~> 5.0.1' # Redis -gem 'redis', '~> 3.2' +gem 'redis', '~> 3.3' gem 'connection_pool', '~> 2.0' # HipChat integration diff --git a/Gemfile.lock b/Gemfile.lock index bb91db1e805..d990ca305b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -603,7 +603,7 @@ GEM json recursive-open-struct (1.0.0) redcarpet (3.4.0) - redis (3.2.2) + redis (3.3.3) redis-actionpack (5.0.1) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) @@ -979,7 +979,7 @@ DEPENDENCIES rdoc (~> 4.2) recaptcha (~> 3.0) redcarpet (~> 3.4) - redis (~> 3.2) + redis (~> 3.3) redis-namespace (~> 1.5.2) redis-rails (~> 5.0.1) request_store (~> 1.3) diff --git a/changelogs/unreleased/sh-upgrade-redis-rb.yml b/changelogs/unreleased/sh-upgrade-redis-rb.yml new file mode 100644 index 00000000000..58aa090043f --- /dev/null +++ b/changelogs/unreleased/sh-upgrade-redis-rb.yml @@ -0,0 +1,4 @@ +--- +title: Upgrade redis-rb to remove the use of Timeout.timeout +merge_request: +author: |