diff --git a/.rubocop.yml b/.rubocop.yml index e5eac1a9b..ea5ad74b8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,15 +1,15 @@ require: + - rubocop-performance + - rubocop-rails - rubocop/rspec/focused - ./lib/cops/add_concurrent_index.rb - ./lib/cops/application_name.rb - ./lib/cops/unscoped.rb -inherit_gem: - rubocop-rails_config: - - config/rails.yml - AllCops: - TargetRubyVersion: 2.7 + TargetRubyVersion: 3.0 + DisabledByDefault: true + SuggestExtensions: false Exclude: - "db/schema.rb" - "db/migrate/20190730153555_recreate_structure.rb" @@ -644,6 +644,9 @@ Performance/RedundantMatch: Performance/RedundantMerge: Enabled: true +Style/HashTransformValues: + Enabled: true + Style/RedundantSortBy: Enabled: true @@ -1373,4 +1376,3 @@ Style/YodaCondition: Style/ZeroLengthPredicate: Enabled: true - diff --git a/Gemfile b/Gemfile index 3377bc729..e6ebfaf0a 100644 --- a/Gemfile +++ b/Gemfile @@ -111,7 +111,8 @@ group :development do gem 'rack-mini-profiler' gem 'rails-erd', require: false # generates `doc/database_models.pdf` gem 'rubocop', require: false - gem 'rubocop-rails_config' + gem 'rubocop-performance', require: false + gem 'rubocop-rails', require: false gem 'rubocop-rspec-focused', require: false gem 'scss_lint', require: false gem 'web-console' diff --git a/Gemfile.lock b/Gemfile.lock index 2ea2134bc..66ef40011 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -620,8 +620,6 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.4.1) parser (>= 2.7.1.5) - rubocop-packaging (0.5.1) - rubocop (>= 0.89, < 2.0) rubocop-performance (1.9.2) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -629,13 +627,6 @@ GEM activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 0.90.0, < 2.0) - rubocop-rails_config (1.3.1) - railties (>= 5.0) - rubocop (>= 1.8) - rubocop-ast (>= 1.0.1) - rubocop-packaging (~> 0.5) - rubocop-performance (~> 1.3) - rubocop-rails (~> 2.0) rubocop-rspec-focused (1.0.0) rubocop (>= 0.51) ruby-graphviz (1.2.5) @@ -874,7 +865,8 @@ DEPENDENCIES rspec-rails rspec_junit_formatter rubocop - rubocop-rails_config + rubocop-performance + rubocop-rails rubocop-rspec-focused ruby-saml-idp sanitize-url