diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-06-24 19:22:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 19:22:13 +0200 |
| commit | 0eebade48cfd92acdc9ff52b5ae9650c1879ff7c (patch) | |
| tree | 4effd93d719786619e0028b175b6915a3dd72f24 | |
| parent | 62bf9296843cd2b387fba89e63f3daec10d2dd24 (diff) | |
| parent | 83b4e8584bda349f832f5d6890c709c919adb7d6 (diff) | |
Merge pull request #1556 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile index d703a4ee8..f6f48edda 100644 --- a/Gemfile +++ b/Gemfile @@ -136,8 +136,8 @@ group :development do gem 'letter_opener', '~> 1.7' gem 'letter_opener_web', '~> 1.4' gem 'memory_profiler' - gem 'rubocop', '~> 1.16', require: false - gem 'rubocop-rails', '~> 2.10', require: false + gem 'rubocop', '~> 1.17', require: false + gem 'rubocop-rails', '~> 2.11', require: false gem 'brakeman', '~> 5.0', require: false gem 'bundler-audit', '~> 0.8', require: false diff --git a/Gemfile.lock b/Gemfile.lock index a598fa3e4..67a7847bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - bindata (2.4.8) + bindata (2.4.10) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) blurhash (0.1.5) @@ -525,7 +525,7 @@ GEM rspec-support (3.10.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.16.1) + rubocop (1.17.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -536,7 +536,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.7.0) parser (>= 3.0.1.1) - rubocop-rails (2.10.1) + rubocop-rails (2.11.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) @@ -771,8 +771,8 @@ DEPENDENCIES rspec-rails (~> 5.0) rspec-sidekiq (~> 3.1) rspec_junit_formatter (~> 0.4) - rubocop (~> 1.16) - rubocop-rails (~> 2.10) + rubocop (~> 1.17) + rubocop-rails (~> 2.11) ruby-progressbar (~> 1.11) sanitize (~> 5.2) scenic (~> 1.5) |