diff options
author | ThibG <thib@sitedethib.com> | 2019-03-06 12:20:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-06 12:20:17 +0100 |
commit | fefacb7b7a21fc4aa40cb18ac797ecb5c44627f6 (patch) | |
tree | 7c4dbacf4603fd834da1bf8645b894634da06d4f /Gemfile.lock | |
parent | e80fabfd84c1e2d157ca1cd536f68f3c75f011c1 (diff) | |
parent | 94a0149ff3e455792050e790d397d1d4d2c2d851 (diff) |
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bf733fb44..3335b8fbc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GEM activemodel (>= 4.1, < 6) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - active_record_query_trace (1.5.4) + active_record_query_trace (1.6) activejob (5.2.2) activesupport (= 5.2.2) globalid (>= 0.3.6) @@ -658,7 +658,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (~> 0.10) - active_record_query_trace (~> 1.5) + active_record_query_trace (~> 1.6) addressable (~> 2.6) annotate (~> 2.7) aws-sdk-s3 (~> 1.30) |