diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-06 11:29:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-06 11:29:06 +0100 |
| commit | 48062329973398fe5b12cadcc389c8602f1bb17f (patch) | |
| tree | e2bfa37e2985b90f2de03d7a47c4ffbd76ed8949 /Gemfile.lock | |
| parent | e80fabfd84c1e2d157ca1cd536f68f3c75f011c1 (diff) | |
| parent | ad6f7ea25036e7065a1a04d020e2f51023e2e614 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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) |