diff options
| author | ThibG <thib@sitedethib.com> | 2020-04-25 17:50:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-25 17:50:22 +0200 |
| commit | 9c61dadc0db7009853c6b2345a02c3b219022929 (patch) | |
| tree | 1a79819019d47e81085941b7698e480bad79ed67 /Gemfile.lock | |
| parent | 60f8a63a76f7c866b5338c33a8b897ba022368ca (diff) | |
| parent | 9d41a410a38549f9d07e550b8cda7460b423cb6b (diff) | |
Merge pull request #1321 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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) |