Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 22165fa

Browse files
committed
Update Rubocop Rails to 2.32 (redmine-42044).
git-svn-id: https://svn.redmine.org/redmine/trunk@23826 e93f8b46-1217-0410-a6f0-8f06a7374b81
1 parent aed38db commit 22165fa

3 files changed

Lines changed: 17 additions & 19 deletions

File tree

.rubocop.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,13 @@ Rails/FindEach:
169169
Rails/HelperInstanceVariable:
170170
Enabled: false
171171

172+
Rails/Output:
173+
Exclude:
174+
- 'config/routes.rb'
175+
- 'lib/redmine/diff.rb'
176+
- 'lib/redmine/diff_table.rb'
177+
- 'test/unit/lib/redmine/scm/adapters/*.rb'
178+
172179
Rails/Pluck:
173180
Exclude:
174181
# `pluck` is not available in Gemfile

.rubocop_todo.yml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ Naming/VariableNumber:
328328
- 'test/unit/project_test.rb'
329329

330330
# Configuration parameters: Severity, Include.
331-
# Include: app/models/**/*.rb
331+
# Include: **/app/models/**/*.rb
332332
Rails/ActiveRecordOverride:
333333
Exclude:
334334
- 'app/models/email_address.rb'
@@ -399,15 +399,15 @@ Rails/EagerEvaluationLogMessage:
399399
- 'app/controllers/application_controller.rb'
400400

401401
# Configuration parameters: Include.
402-
# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
402+
# Include: **/app/**/*.rb, **/config/**/*.rb, **/lib/**/*.rb
403403
Rails/Exit:
404404
Exclude:
405405
- 'config/environment.rb'
406406
- 'config/initializers/10-patches.rb'
407407
- 'config/routes.rb'
408408

409409
# Configuration parameters: Include.
410-
# Include: app/models/**/*.rb
410+
# Include: **/app/models/**/*.rb
411411
Rails/HasAndBelongsToMany:
412412
Exclude:
413413
- 'app/models/changeset.rb'
@@ -422,7 +422,7 @@ Rails/HasAndBelongsToMany:
422422
- 'app/models/user.rb'
423423

424424
# Configuration parameters: Include.
425-
# Include: app/models/**/*.rb
425+
# Include: **/app/models/**/*.rb
426426
Rails/HasManyOrHasOneDependent:
427427
Exclude:
428428
- 'app/models/auth_source.rb'
@@ -456,7 +456,7 @@ Rails/I18nLocaleTexts:
456456
- 'app/models/mailer.rb'
457457

458458
# Configuration parameters: IgnoreScopes, Include.
459-
# Include: app/models/**/*.rb
459+
# Include: **/app/models/**/*.rb
460460
Rails/InverseOf:
461461
Exclude:
462462
- 'app/models/board.rb'
@@ -480,7 +480,7 @@ Rails/InverseOf:
480480
- 'app/models/wiki_page.rb'
481481

482482
# Configuration parameters: Include.
483-
# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
483+
# Include: **/app/controllers/**/*.rb, **/app/mailers/**/*.rb
484484
Rails/LexicallyScopedActionFilter:
485485
Exclude:
486486
- 'app/controllers/projects_controller.rb'
@@ -492,7 +492,7 @@ Rails/LinkToBlank:
492492

493493
# This cop supports safe autocorrection (--autocorrect).
494494
# Configuration parameters: Include.
495-
# Include: config/routes.rb, config/routes/**/*.rb
495+
# Include: **/config/routes.rb, **/config/routes/**/*.rb
496496
Rails/MatchRoute:
497497
Exclude:
498498
- 'config/routes.rb'
@@ -501,15 +501,6 @@ Rails/MatchRoute:
501501
Rails/NegateInclude:
502502
Enabled: false
503503

504-
# This cop supports unsafe autocorrection (--autocorrect-all).
505-
# Configuration parameters: Include.
506-
# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
507-
Rails/Output:
508-
Exclude:
509-
- 'config/routes.rb'
510-
- 'lib/redmine/diff.rb'
511-
- 'lib/redmine/diff_table.rb'
512-
513504
Rails/OutputSafety:
514505
Enabled: false
515506

@@ -538,7 +529,7 @@ Rails/Present:
538529

539530
# This cop supports safe autocorrection (--autocorrect).
540531
# Configuration parameters: Include.
541-
# Include: app/models/**/*.rb
532+
# Include: **/app/models/**/*.rb
542533
Rails/ReadWriteAttribute:
543534
Exclude:
544535
- 'app/models/auth_source_ldap.rb'
@@ -597,7 +588,7 @@ Rails/TimeZone:
597588

598589
# This cop supports safe autocorrection (--autocorrect).
599590
# Configuration parameters: Include.
600-
# Include: app/models/**/*.rb
591+
# Include: **/app/models/**/*.rb
601592
Rails/Validation:
602593
Enabled: false
603594

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ group :test do
113113
# RuboCop
114114
gem 'rubocop', '~> 1.76.0', require: false
115115
gem 'rubocop-performance', '~> 1.25.0', require: false
116-
gem 'rubocop-rails', '~> 2.31.0', require: false
116+
gem 'rubocop-rails', '~> 2.32.0', require: false
117117
gem 'bundle-audit', require: false
118118
end
119119

0 commit comments

Comments
 (0)