summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock12
2 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index 66b1473a416..c23a42e2e1e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,7 +135,7 @@ group :development do
gem 'letter_opener_web', '~> 1.4'
gem 'memory_profiler'
gem 'rubocop', '~> 1.13', require: false
- gem 'rubocop-rails', '~> 2.9', require: false
+ gem 'rubocop-rails', '~> 2.10', require: false
gem 'brakeman', '~> 5.0', require: false
gem 'bundler-audit', '~> 0.8', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 8f8d583bd55..26b295f632d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -401,7 +401,7 @@ GEM
parallel (1.20.1)
parallel_tests (3.7.0)
parallel
- parser (3.0.1.0)
+ parser (3.0.1.1)
ast (~> 2.4.1)
parslet (2.0.0)
pastel (0.8.0)
@@ -533,12 +533,12 @@ GEM
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
- rubocop-ast (1.4.1)
- parser (>= 2.7.1.5)
- rubocop-rails (2.9.1)
+ rubocop-ast (1.5.0)
+ parser (>= 3.0.1.1)
+ rubocop-rails (2.10.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
- rubocop (>= 0.90.0, < 2.0)
+ rubocop (>= 1.7.0, < 2.0)
ruby-progressbar (1.11.0)
ruby-saml (1.11.0)
nokogiri (>= 1.5.10)
@@ -770,7 +770,7 @@ DEPENDENCIES
rspec-sidekiq (~> 3.1)
rspec_junit_formatter (~> 0.4)
rubocop (~> 1.13)
- rubocop-rails (~> 2.9)
+ rubocop-rails (~> 2.10)
ruby-progressbar (~> 1.11)
sanitize (~> 5.2)
scenic (~> 1.5)