diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 3b18bab40..12e2fe5f3 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -670,6 +670,10 @@ Rails/Delegate: - 'app/models/wiki_content_version.rb' - 'lib/redmine/menu_manager.rb' +Rails/DuplicateScope: + Exclude: + - 'app/models/enumeration.rb' + # This cop supports unsafe auto-correction (--auto-correct-all). # Configuration parameters: Whitelist, AllowedMethods, AllowedReceivers. # Whitelist: find_by_sql @@ -775,6 +779,10 @@ Rails/I18nLocaleAssignment: - 'test/unit/query_test.rb' - 'test/unit/role_test.rb' +Rails/I18nLocaleTexts: + Exclude: + - 'app/models/mailer.rb' + # Configuration parameters: IgnoreScopes, Include. # Include: app/models/**/*.rb Rails/InverseOf: diff --git a/Gemfile b/Gemfile index 1ca863649..240118039 100644 --- a/Gemfile +++ b/Gemfile @@ -102,7 +102,7 @@ group :test do # RuboCop gem 'rubocop', '~> 1.26.0' gem 'rubocop-performance', '~> 1.13.0' - gem 'rubocop-rails', '~> 2.13.0' + gem 'rubocop-rails', '~> 2.14.0' end local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")