diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-20 13:56:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 13:56:37 +0100 |
| commit | aa362ab73dc7121104b3c01800152b9fc56ea396 (patch) | |
| tree | f0f5879a51325856887a2e32a4c3f9654af61aab /Gemfile.lock | |
| parent | 530d29148ca0c5bf29f6fa516b1ef4f91d95894b (diff) | |
| parent | 5145c81620efbd5cf8dc911858d17d1fa888c996 (diff) | |
Merge pull request #888 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a94e4f145..0d37a8d36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,14 +100,14 @@ GEM debug_inspector (>= 0.0.1) bootsnap (1.3.2) msgpack (~> 1.0) - brakeman (4.3.1) + brakeman (4.4.0) browser (2.5.3) builder (3.2.3) bullet (5.9.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - bundler-audit (0.6.0) - bundler (~> 1.2) + bundler-audit (0.6.1) + bundler (>= 1.2.0, < 3) thor (~> 0.18) byebug (10.0.2) capistrano (3.11.0) @@ -286,10 +286,10 @@ GEM idn-ruby (0.1.0) ipaddress (0.8.3) iso-639 (0.2.8) - jaro_winkler (1.5.1) + jaro_winkler (1.5.2) jmespath (1.4.0) json (2.1.0) - json-ld (2.2.1) + json-ld (3.0.2) multi_json (~> 1.12) rdf (>= 2.2.8, < 4.0) json-ld-preloaded (3.0.0) @@ -365,7 +365,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.2) sidekiq (>= 3.5) statsd-ruby (~> 1.4, >= 1.4.0) - oj (3.7.6) + oj (3.7.7) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) @@ -394,7 +394,7 @@ GEM parallel (1.12.1) parallel_tests (2.27.1) parallel - parser (2.5.3.0) + parser (2.6.0.0) ast (~> 2.4.0) pastel (0.7.2) equatable (~> 0.5.0) @@ -473,7 +473,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - rdf (3.0.7) + rdf (3.0.9) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) rdf-normalize (0.3.3) @@ -527,7 +527,7 @@ GEM rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) rspec-support (3.8.0) - rubocop (0.62.0) + rubocop (0.63.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) @@ -663,7 +663,7 @@ DEPENDENCIES better_errors (~> 2.5) binding_of_caller (~> 0.7) bootsnap (~> 1.3) - brakeman (~> 4.3) + brakeman (~> 4.4) browser bullet (~> 5.9) bundler-audit (~> 0.6) @@ -702,7 +702,7 @@ DEPENDENCIES i18n-tasks (~> 0.9) idn-ruby iso-639 - json-ld (~> 2.2) + json-ld (~> 3.0) json-ld-preloaded (~> 3.0) kaminari (~> 1.1) letter_opener (~> 1.7) @@ -749,7 +749,7 @@ DEPENDENCIES rqrcode (~> 0.10) rspec-rails (~> 3.8) rspec-sidekiq (~> 3.0) - rubocop (~> 0.62) + rubocop (~> 0.63) sanitize (~> 5.0) scss_lint (~> 0.57) sidekiq (~> 5.2) |