diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-25 12:48:48 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-07-25 12:48:48 +0200 |
| commit | b5e10d07ff756ab4f4101c8ee356caff92852e22 (patch) | |
| tree | cb24b1ef19239abd226b17f305fd91daf19dc227 /Gemfile.lock | |
| parent | a2df067f9852f0db3140dd2c35539f4e74bdb6dc (diff) | |
| parent | a8a7066e977cb0aa1988d340ef8b7c542f179b14 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f17bcd87a..acde440de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -301,7 +301,7 @@ GEM multi_json (~> 1.14) rack (~> 2.0) rdf (~> 3.1) - json-ld-preloaded (3.1.5) + json-ld-preloaded (3.1.6) json-ld (~> 3.1) rdf (~> 3.1) jsonapi-renderer (0.2.2) @@ -374,7 +374,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.2) sidekiq (>= 3.5) statsd-ruby (~> 1.4, >= 1.4.0) - oj (3.11.8) + oj (3.12.1) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -401,7 +401,7 @@ GEM parallel (1.20.1) parallel_tests (3.7.0) parallel - parser (3.0.1.1) + parser (3.0.2.0) ast (~> 2.4.1) parslet (2.0.0) pastel (0.8.0) @@ -480,7 +480,7 @@ GEM thor (~> 1.0) rainbow (3.0.0) rake (13.0.3) - rdf (3.1.13) + rdf (3.1.15) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) rdf-normalize (0.4.0) @@ -535,7 +535,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.7.0) parser (>= 3.0.1.1) - rubocop-rails (2.11.2) + rubocop-rails (2.11.3) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) @@ -734,7 +734,7 @@ DEPENDENCIES net-ldap (~> 0.17) nokogiri (~> 1.11) nsa (~> 0.2) - oj (~> 3.11) + oj (~> 3.12) omniauth (~> 1.9) omniauth-cas (~> 2.0) omniauth-rails_csrf_protection (~> 0.1) |