From 84ab182bc0737b4b8fdd56172dca4af2170d950f Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Fri, 29 Nov 2019 07:57:22 +0000 Subject: [PATCH] Update RuboCop Rails to 2.4 (#32531). git-svn-id: http://svn.redmine.org/redmine/trunk@19321 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 32 +++++++++++++++++++++++++++++++- Gemfile | 2 +- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 9c8ca1fc9..9667387e6 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -577,6 +577,19 @@ Rails/ActiveRecordOverride: - 'app/models/journal.rb' - 'app/models/member.rb' +# Cop supports --auto-correct. +Rails/ApplicationController: + Exclude: + - 'app/controllers/mail_handler_controller.rb' + - 'app/controllers/sys_controller.rb' + - 'test/unit/lib/redmine/hook_test.rb' + +# Cop supports --auto-correct. +Rails/ApplicationMailer: + Exclude: + - 'app/models/mail_handler.rb' + - 'app/models/mailer.rb' + # Cop supports --auto-correct. Rails/ApplicationRecord: Enabled: false @@ -650,7 +663,24 @@ Rails/Exit: # Configuration parameters: EnforcedStyle. # SupportedStyles: slashes, arguments Rails/FilePath: - Enabled: false + Exclude: + - 'app/models/attachment.rb' + - 'app/models/import.rb' + - 'app/models/setting.rb' + - 'config/environment.rb' + - 'config/initializers/00-core_plugins.rb' + - 'config/initializers/10-patches.rb' + - 'lib/redmine/configuration.rb' + - 'lib/redmine/export/pdf.rb' + - 'lib/redmine/plugin.rb' + - 'lib/redmine/version.rb' + - 'test/application_system_test_case.rb' + - 'test/functional/custom_fields_controller_test.rb' + - 'test/functional/settings_controller_test.rb' + - 'test/test_helper.rb' + - 'test/unit/lib/redmine/configuration_test.rb' + - 'test/unit/lib/redmine/i18n_test.rb' + - 'test/unit/lib/redmine/plugin_test.rb' # Cop supports --auto-correct. # Configuration parameters: Include. diff --git a/Gemfile b/Gemfile index 8696c6ffd..ee37520fa 100644 --- a/Gemfile +++ b/Gemfile @@ -86,7 +86,7 @@ group :test do # RuboCop gem 'rubocop', '~> 0.77.0' gem 'rubocop-performance', '~> 1.5.0' - gem 'rubocop-rails', '~> 2.3.0' + gem 'rubocop-rails', '~> 2.4.0' end local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") -- 2.39.5