Commit 87afcdff authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'cs-upgrade-redis-actionpack' into 'master'

Upgrade redis-rails from 4.0.0 to 5.0.1.

This updates redis-rails to 5.0.1 along with its dependencies. I helped upgrade redis-actionpack so it would work with both Rails 4.2 and 5.0 in the same version.

Unfortunately none of the gems have Changelogs :/

- redis-rails: https://github.com/redis-store/redis-rails
- redis-actionpack: https://github.com/redis-store/redis-actionpack
- redis-activesupport: https://github.com/redis-store/redis-activesupport
- redis-rack: https://github.com/redis-store/redis-rack
- redis-store: https://github.com/redis-store/redis-store

Working toward #14286.

See merge request !7291
parents 93f4234d 18a26c33
...@@ -152,7 +152,7 @@ gem 'settingslogic', '~> 2.0.9' ...@@ -152,7 +152,7 @@ gem 'settingslogic', '~> 2.0.9'
gem 'version_sorter', '~> 2.1.0' gem 'version_sorter', '~> 2.1.0'
# Cache # Cache
gem 'redis-rails', '~> 4.0.0' gem 'redis-rails', '~> 5.0.1'
# Redis # Redis
gem 'redis', '~> 3.2' gem 'redis', '~> 3.2'
......
...@@ -573,23 +573,23 @@ GEM ...@@ -573,23 +573,23 @@ GEM
json json
redcarpet (3.3.3) redcarpet (3.3.3)
redis (3.2.2) redis (3.2.2)
redis-actionpack (4.0.1) redis-actionpack (5.0.1)
actionpack (~> 4) actionpack (>= 4.0, < 6)
redis-rack (~> 1.5.0) redis-rack (>= 1, < 3)
redis-store (~> 1.1.0) redis-store (>= 1.1.0, < 1.4.0)
redis-activesupport (4.1.5) redis-activesupport (5.0.1)
activesupport (>= 3, < 5) activesupport (>= 3, < 6)
redis-store (~> 1.1.0) redis-store (~> 1.2.0)
redis-namespace (1.5.2) redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4) redis (~> 3.0, >= 3.0.4)
redis-rack (1.5.0) redis-rack (1.6.0)
rack (~> 1.5) rack (~> 1.5)
redis-store (~> 1.1.0) redis-store (~> 1.2.0)
redis-rails (4.0.0) redis-rails (5.0.1)
redis-actionpack (~> 4) redis-actionpack (~> 5.0.0)
redis-activesupport (~> 4) redis-activesupport (~> 5.0.0)
redis-store (~> 1.1.0) redis-store (~> 1.2.0)
redis-store (1.1.7) redis-store (1.2.0)
redis (>= 2.2) redis (>= 2.2)
request_store (1.3.1) request_store (1.3.1)
rerun (0.11.0) rerun (0.11.0)
...@@ -938,7 +938,7 @@ DEPENDENCIES ...@@ -938,7 +938,7 @@ DEPENDENCIES
redcarpet (~> 3.3.3) redcarpet (~> 3.3.3)
redis (~> 3.2) redis (~> 3.2)
redis-namespace (~> 1.5.2) redis-namespace (~> 1.5.2)
redis-rails (~> 4.0.0) redis-rails (~> 5.0.1)
request_store (~> 1.3) request_store (~> 1.3)
rerun (~> 0.11.0) rerun (~> 0.11.0)
responders (~> 2.0) responders (~> 2.0)
...@@ -994,4 +994,4 @@ DEPENDENCIES ...@@ -994,4 +994,4 @@ DEPENDENCIES
wikicloth (= 0.8.1) wikicloth (= 0.8.1)
BUNDLED WITH BUNDLED WITH
1.13.5 1.13.6
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment