diff options
author | ThibG <thib@sitedethib.com> | 2019-07-24 16:53:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-24 16:53:25 +0200 |
commit | 88e79c179a1a48feff3b16226c46f5885442651e (patch) | |
tree | 020d6a6ef6b4a236f14d6287e4ff97c0750db3c9 /Gemfile.lock | |
parent | e3a551cbd1f894fa779dc55168e56bb5f07b3d72 (diff) | |
parent | 2d35e4460a6c55930568d4b19563f9894d89e79b (diff) |
Merge pull request #1176 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 9c2aca4be..b09161295 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,9 +45,9 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_model_serializers (0.10.9) - actionpack (>= 4.1, < 6) - activemodel (>= 4.1, < 6) + active_model_serializers (0.10.10) + actionpack (>= 4.1, < 6.1) + activemodel (>= 4.1, < 6.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) active_record_query_trace (1.6.2) @@ -306,7 +306,7 @@ GEM json-ld (~> 3.0) multi_json (~> 1.12) rdf (~> 3.0) - jsonapi-renderer (0.2.0) + jsonapi-renderer (0.2.2) jwt (2.1.0) kaminari (1.1.1) activesupport (>= 4.1.0) |