diff --git a/.codeclimate.yml b/.codeclimate.yml index 703afb096..1912d4721 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -23,7 +23,7 @@ engines: enabled: true rubocop: enabled: true - channel: rubocop-0-75 + channel: rubocop-1-22-2 ratings: paths: - Gemfile.lock diff --git a/.rubocop.yml b/.rubocop.yml index 0127904f3..9d8d399a5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -9,7 +9,7 @@ AllCops: require: - rubocop-rails - rubocop-rspec - - rubocop-rake + # - rubocop-rake - rubocop-performance # ================================================================================ diff --git a/Gemfile b/Gemfile index 90ae8acfb..f20ed7df0 100644 --- a/Gemfile +++ b/Gemfile @@ -131,10 +131,9 @@ gem 'exception_handler', '~> 0.8.0', git: 'https://github.com/weedySeaDragon/exc group :development, :test do gem 'puma', '>= 5.6.4' # passenger is used on the production system - gem 'rubocop', '= 1.22.1', require: false + gem 'rubocop', '= 1.22.2', require: false gem 'rubocop-rails', '= 2.13.2', require: false gem 'rubocop-rspec', '= 2.9.0', require: false - gem 'rubocop-rake', require: false gem 'rubocop-performance', '= 1.13.2', require: false gem 'rspec-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 133982f14..679a92bce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -436,7 +436,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rb-readline (0.5.5) - regexp_parser (2.4.0) + regexp_parser (2.5.0) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) @@ -466,7 +466,7 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.11.0) - rubocop (1.22.1) + rubocop (1.22.2) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -484,8 +484,6 @@ GEM activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) - rubocop-rake (0.6.0) - rubocop (~> 1.0) rubocop-rspec (2.9.0) rubocop (~> 1.19) ruby-progressbar (1.11.0) @@ -684,10 +682,9 @@ DEPENDENCIES rb-readline routing-filter rspec-rails - rubocop (= 1.22.1) + rubocop (= 1.22.2) rubocop-performance (= 1.13.2) rubocop-rails (= 2.13.2) - rubocop-rake rubocop-rspec (= 2.9.0) rubyzip (>= 1.2.1) sanitize