diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-09-19 14:10:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-19 14:10:26 +0200 |
commit | 3d05ebfdc3524cff9f01b760176e175e73b55875 (patch) | |
tree | d9e028134a9476fd8880d2df777424784286836b /Gemfile.lock | |
parent | 35469b1952c03ba8192bd28fc9cbc39cdcca9f4c (diff) | |
parent | bf827b17e1c372f618652bff9578c36a751c44f5 (diff) |
Merge pull request #1604 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a524d26bb..baf67c0f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,7 +104,7 @@ GEM debug_inspector (>= 0.0.1) blurhash (0.1.5) ffi (~> 1.14) - bootsnap (1.6.0) + bootsnap (1.8.1) msgpack (~> 1.0) brakeman (5.1.1) browser (4.2.0) @@ -115,7 +115,7 @@ GEM bullet (6.1.5) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - bundler-audit (0.8.0) + bundler-audit (0.9.0.1) bundler (>= 1.2.0, < 3) thor (~> 1.0) byebug (11.1.3) @@ -373,7 +373,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.2) sidekiq (>= 3.5) statsd-ruby (~> 1.4, >= 1.4.0) - oj (3.13.4) + oj (3.13.7) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -397,7 +397,7 @@ GEM mime-types mimemagic (~> 0.3.0) terrapin (~> 0.6.0) - parallel (1.20.1) + parallel (1.21.0) parallel_tests (3.7.1) parallel parser (3.0.2.0) @@ -534,7 +534,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.11.0) parser (>= 3.0.1.1) - rubocop-rails (2.11.3) + rubocop-rails (2.12.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) @@ -678,11 +678,11 @@ DEPENDENCIES better_errors (~> 2.9) binding_of_caller (~> 1.0) blurhash (~> 0.1) - bootsnap (~> 1.6.0) + bootsnap (~> 1.8.1) brakeman (~> 5.1) browser bullet (~> 6.1) - bundler-audit (~> 0.8) + bundler-audit (~> 0.9) capistrano (~> 3.16) capistrano-rails (~> 1.6) capistrano-rbenv (~> 2.2) @@ -740,7 +740,7 @@ DEPENDENCIES omniauth-saml (~> 1.10) ox (~> 2.14) paperclip (~> 6.0) - parallel (~> 1.20) + parallel (~> 1.21) parallel_tests (~> 3.7) parslet pg (~> 1.2) @@ -769,7 +769,7 @@ DEPENDENCIES rspec-sidekiq (~> 3.1) rspec_junit_formatter (~> 0.4) rubocop (~> 1.21) - rubocop-rails (~> 2.11) + rubocop-rails (~> 2.12) ruby-progressbar (~> 1.11) sanitize (~> 6.0) scenic (~> 1.5) |