diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-04-25 15:19:32 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-25 15:19:32 +0200 |
commit | 8b2823b7b6e5120ef8830db49e1e19927867ce14 (patch) | |
tree | 0e94a8cca8257fe9c60d5548d03ff915b6fa6729 /Gemfile.lock | |
parent | 60f8a63a76f7c866b5338c33a8b897ba022368ca (diff) | |
parent | be637146f310d7ec3a49d01e850959514e9e4964 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b70dd2502..13f6bed59 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -407,7 +407,7 @@ GEM parallel (1.19.1) parallel_tests (2.32.0) parallel - parser (2.7.1.0) + parser (2.7.1.1) ast (~> 2.4.0) parslet (1.8.2) pastel (0.7.3) @@ -492,9 +492,9 @@ GEM rdf (~> 3.1) redcarpet (3.5.0) redis (4.1.3) - redis-actionpack (5.0.2) - actionpack (>= 4.0, < 6) - redis-rack (>= 1, < 3) + redis-actionpack (5.2.0) + actionpack (>= 5, < 7) + redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) redis-activesupport (5.0.4) activesupport (>= 3, < 6) |