summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.rubocop.yml7
-rw-r--r--.rubocop_todo.yml27
-rw-r--r--Gemfile2
3 files changed, 17 insertions, 19 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 5ddce9aa6..77857c9cd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -169,6 +169,13 @@ Rails/FindEach:
Rails/HelperInstanceVariable:
Enabled: false
+Rails/Output:
+ Exclude:
+ - 'config/routes.rb'
+ - 'lib/redmine/diff.rb'
+ - 'lib/redmine/diff_table.rb'
+ - 'test/unit/lib/redmine/scm/adapters/*.rb'
+
Rails/Pluck:
Exclude:
# `pluck` is not available in Gemfile
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 81e6b6a9f..1aafe4925 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -328,7 +328,7 @@ Naming/VariableNumber:
- 'test/unit/project_test.rb'
# Configuration parameters: Severity, Include.
-# Include: app/models/**/*.rb
+# Include: **/app/models/**/*.rb
Rails/ActiveRecordOverride:
Exclude:
- 'app/models/email_address.rb'
@@ -399,7 +399,7 @@ Rails/EagerEvaluationLogMessage:
- 'app/controllers/application_controller.rb'
# Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
+# Include: **/app/**/*.rb, **/config/**/*.rb, **/lib/**/*.rb
Rails/Exit:
Exclude:
- 'config/environment.rb'
@@ -407,7 +407,7 @@ Rails/Exit:
- 'config/routes.rb'
# Configuration parameters: Include.
-# Include: app/models/**/*.rb
+# Include: **/app/models/**/*.rb
Rails/HasAndBelongsToMany:
Exclude:
- 'app/models/changeset.rb'
@@ -422,7 +422,7 @@ Rails/HasAndBelongsToMany:
- 'app/models/user.rb'
# Configuration parameters: Include.
-# Include: app/models/**/*.rb
+# Include: **/app/models/**/*.rb
Rails/HasManyOrHasOneDependent:
Exclude:
- 'app/models/auth_source.rb'
@@ -456,7 +456,7 @@ Rails/I18nLocaleTexts:
- 'app/models/mailer.rb'
# Configuration parameters: IgnoreScopes, Include.
-# Include: app/models/**/*.rb
+# Include: **/app/models/**/*.rb
Rails/InverseOf:
Exclude:
- 'app/models/board.rb'
@@ -480,7 +480,7 @@ Rails/InverseOf:
- 'app/models/wiki_page.rb'
# Configuration parameters: Include.
-# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
+# Include: **/app/controllers/**/*.rb, **/app/mailers/**/*.rb
Rails/LexicallyScopedActionFilter:
Exclude:
- 'app/controllers/projects_controller.rb'
@@ -492,7 +492,7 @@ Rails/LinkToBlank:
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: Include.
-# Include: config/routes.rb, config/routes/**/*.rb
+# Include: **/config/routes.rb, **/config/routes/**/*.rb
Rails/MatchRoute:
Exclude:
- 'config/routes.rb'
@@ -501,15 +501,6 @@ Rails/MatchRoute:
Rails/NegateInclude:
Enabled: false
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
-Rails/Output:
- Exclude:
- - 'config/routes.rb'
- - 'lib/redmine/diff.rb'
- - 'lib/redmine/diff_table.rb'
-
Rails/OutputSafety:
Enabled: false
@@ -538,7 +529,7 @@ Rails/Present:
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: Include.
-# Include: app/models/**/*.rb
+# Include: **/app/models/**/*.rb
Rails/ReadWriteAttribute:
Exclude:
- 'app/models/auth_source_ldap.rb'
@@ -597,7 +588,7 @@ Rails/TimeZone:
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: Include.
-# Include: app/models/**/*.rb
+# Include: **/app/models/**/*.rb
Rails/Validation:
Enabled: false
diff --git a/Gemfile b/Gemfile
index 720987c1b..3045f0e50 100644
--- a/Gemfile
+++ b/Gemfile
@@ -113,7 +113,7 @@ group :test do
# RuboCop
gem 'rubocop', '~> 1.76.0', require: false
gem 'rubocop-performance', '~> 1.25.0', require: false
- gem 'rubocop-rails', '~> 2.31.0', require: false
+ gem 'rubocop-rails', '~> 2.32.0', require: false
gem 'bundle-audit', require: false
end