diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-11 12:35:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-11 12:35:25 +0200 |
| commit | fe00f7a7e4469d18b43be2159fa9d953d2050f46 (patch) | |
| tree | f2af743c222ad8d9dc81299195d01a3fe6b54e02 /Gemfile.lock | |
| parent | d4d4e84324701243ce05930f45b2dc876e38c7d0 (diff) | |
| parent | 14d855c42985503b525f1a77d00fada3bd15b96f (diff) | |
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index aab27ac93..b170b9aa3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -395,7 +395,7 @@ GEM av (~> 0.9.0) paperclip (>= 2.5.2) parallel (1.17.0) - parallel_tests (2.28.0) + parallel_tests (2.29.0) parallel parser (2.6.3.0) ast (~> 2.4.0) @@ -480,7 +480,7 @@ GEM link_header (~> 0.0, >= 0.0.8) rdf-normalize (0.3.3) rdf (>= 2.2, < 4.0) - redis (4.1.0) + redis (4.1.1) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) @@ -727,7 +727,7 @@ DEPENDENCIES ox (~> 2.10) paperclip (~> 6.0) paperclip-av-transcoder (~> 0.6) - parallel_tests (~> 2.28) + parallel_tests (~> 2.29) pg (~> 1.1) pghero (~> 2.2) pkg-config (~> 1.3) |