From 62a212faa4083ba068ab740e69857707208d6e2e Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 9 Dec 2020 04:14:42 +0000 Subject: [PATCH] Update RuboCop Rails to 2.9 (#32531). git-svn-id: http://svn.redmine.org/redmine/trunk@20585 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 21 ++++++++++++++++++++- Gemfile | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index c2de6bab6..e656db936 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -721,8 +721,9 @@ Rails/FindBy: - 'app/models/wiki_content_version.rb' # Cop supports --auto-correct. -# Configuration parameters: Include. +# Configuration parameters: Include, IgnoredMethods. # Include: app/models/**/*.rb +# IgnoredMethods: order, limit, select, lock Rails/FindEach: Exclude: - 'app/models/auth_source.rb' @@ -732,6 +733,7 @@ Rails/FindEach: - 'app/models/project.rb' - 'app/models/query.rb' - 'app/models/repository.rb' + - 'app/models/repository/cvs.rb' - 'app/models/setting.rb' - 'app/models/watcher.rb' - 'app/models/wiki_page.rb' @@ -943,6 +945,23 @@ Rails/TimeZone: Rails/Validation: Enabled: false +# Cop supports --auto-correct. +Rails/WhereEquals: + Exclude: + - 'app/models/group.rb' + - 'app/models/issue.rb' + - 'app/models/repository.rb' + - 'app/models/user.rb' + - 'db/migrate/101_populate_changesets_user_id.rb' + - 'db/migrate/20090614091200_fix_messages_sticky_null.rb' + - 'db/migrate/20090704172350_populate_users_type.rb' + - 'db/migrate/20101104182107_add_unique_index_on_members.rb' + - 'db/migrate/20111201201315_add_unique_index_to_issue_relations.rb' + - 'db/migrate/20120115143126_set_default_repositories.rb' + - 'db/migrate/20120422150750_change_repositories_to_full_sti.rb' + - 'lib/redmine/helpers/gantt.rb' + - 'test/functional/issues_controller_test.rb' + # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: exists, where diff --git a/Gemfile b/Gemfile index f94039a76..9824c3b2e 100644 --- a/Gemfile +++ b/Gemfile @@ -94,7 +94,7 @@ group :test do # RuboCop gem 'rubocop', '~> 1.5.2' gem 'rubocop-performance', '~> 1.9.0' - gem 'rubocop-rails', '~> 2.8.0' + gem 'rubocop-rails', '~> 2.9.0' end local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") -- 2.39.5