Skip to content

Commit 6ba3e85

Browse files
committed
Update RuboCop Rails to 2.8 (#32531).
git-svn-id: http://svn.redmine.org/redmine/trunk@20172 e93f8b46-1217-0410-a6f0-8f06a7374b81
1 parent a922035 commit 6ba3e85

File tree

2 files changed

+93
-4
lines changed

2 files changed

+93
-4
lines changed

.rubocop_todo.yml

Lines changed: 92 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,23 @@ Performance/StringReplacement:
569569
- 'test/unit/repository_cvs_test.rb'
570570
- 'test/unit/repository_git_test.rb'
571571

572+
# Cop supports --auto-correct.
573+
# Configuration parameters: Include.
574+
# Include: app/models/**/*.rb
575+
Rails/ActiveRecordCallbacksOrder:
576+
Exclude:
577+
- 'app/models/attachment.rb'
578+
- 'app/models/change.rb'
579+
- 'app/models/changeset.rb'
580+
- 'app/models/enumeration.rb'
581+
- 'app/models/issue.rb'
582+
- 'app/models/issue_status.rb'
583+
- 'app/models/member_role.rb'
584+
- 'app/models/project.rb'
585+
- 'app/models/user.rb'
586+
- 'app/models/version.rb'
587+
- 'app/models/wiki_page.rb'
588+
572589
# Configuration parameters: Include.
573590
# Include: app/models/**/*.rb
574591
Rails/ActiveRecordOverride:
@@ -618,6 +635,10 @@ Rails/Blank:
618635
- 'lib/redmine/field_format.rb'
619636
- 'lib/redmine/wiki_formatting/macros.rb'
620637

638+
# Cop supports --auto-correct.
639+
Rails/ContentTag:
640+
Enabled: false
641+
621642
# Configuration parameters: Include.
622643
# Include: db/migrate/*.rb
623644
Rails/CreateTableWithTimestamps:
@@ -647,8 +668,10 @@ Rails/Delegate:
647668
- 'lib/redmine/menu_manager.rb'
648669

649670
# Cop supports --auto-correct.
650-
# Configuration parameters: Whitelist.
671+
# Configuration parameters: Whitelist, AllowedMethods, AllowedReceivers.
651672
# Whitelist: find_by_sql
673+
# AllowedMethods: find_by_sql
674+
# AllowedReceivers: Gem::Specification
652675
Rails/DynamicFindBy:
653676
Enabled: false
654677

@@ -787,6 +810,17 @@ Rails/LinkToBlank:
787810
Exclude:
788811
- 'app/helpers/avatars_helper.rb'
789812

813+
# Cop supports --auto-correct.
814+
# Configuration parameters: Include.
815+
# Include: config/routes.rb, config/routes/**/*.rb
816+
Rails/MatchRoute:
817+
Exclude:
818+
- 'config/routes.rb'
819+
820+
# Cop supports --auto-correct.
821+
Rails/NegateInclude:
822+
Enabled: false
823+
790824
# Configuration parameters: Include.
791825
# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
792826
Rails/Output:
@@ -798,6 +832,12 @@ Rails/Output:
798832
Rails/OutputSafety:
799833
Enabled: false
800834

835+
# Cop supports --auto-correct.
836+
Rails/Pluck:
837+
Exclude:
838+
- 'app/helpers/versions_helper.rb'
839+
- 'test/unit/query_test.rb'
840+
801841
# Cop supports --auto-correct.
802842
Rails/PluralizationGrammar:
803843
Exclude:
@@ -848,6 +888,14 @@ Rails/ReadWriteAttribute:
848888
- 'app/models/user_preference.rb'
849889
- 'app/models/wiki_page.rb'
850890

891+
# Cop supports --auto-correct.
892+
Rails/RedundantForeignKey:
893+
Exclude:
894+
- 'app/models/changeset.rb'
895+
- 'app/models/custom_field.rb'
896+
- 'app/models/query.rb'
897+
- 'app/models/role.rb'
898+
851899
Rails/ReflectionClassName:
852900
Exclude:
853901
- 'lib/redmine/nested_set/issue_nested_set.rb'
@@ -867,8 +915,21 @@ Rails/RefuteMethods:
867915
- 'test/unit/custom_field_test.rb'
868916
- 'test/unit/lib/redmine/project_jump_box_test.rb'
869917

870-
# Configuration parameters: Blacklist, Whitelist.
871-
# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
918+
# Cop supports --auto-correct.
919+
# Configuration parameters: EnforcedStyle.
920+
# SupportedStyles: conservative, aggressive
921+
Rails/ShortI18n:
922+
Exclude:
923+
- 'test/unit/issue_test.rb'
924+
- 'test/unit/member_test.rb'
925+
- 'test/unit/repository_test.rb'
926+
- 'test/unit/time_entry_test.rb'
927+
- 'test/unit/user_test.rb'
928+
- 'test/unit/version_test.rb'
929+
- 'test/unit/wiki_page_test.rb'
930+
931+
# Configuration parameters: ForbiddenMethods, AllowedMethods.
932+
# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
872933
Rails/SkipsModelValidations:
873934
Enabled: false
874935

@@ -884,6 +945,34 @@ Rails/TimeZone:
884945
Rails/Validation:
885946
Enabled: false
886947

948+
# Cop supports --auto-correct.
949+
# Configuration parameters: EnforcedStyle.
950+
# SupportedStyles: exists, where
951+
Rails/WhereExists:
952+
Exclude:
953+
- 'app/controllers/issues_controller.rb'
954+
- 'app/models/issue.rb'
955+
- 'app/models/project.rb'
956+
- 'app/models/user.rb'
957+
- 'app/models/watcher.rb'
958+
- 'lib/redmine/default_data/loader.rb'
959+
- 'test/functional/workflows_controller_test.rb'
960+
- 'test/unit/document_category_test.rb'
961+
- 'test/unit/enumeration_test.rb'
962+
- 'test/unit/issue_status_test.rb'
963+
- 'test/unit/project_test.rb'
964+
- 'test/unit/workflow_transition_test.rb'
965+
966+
# Cop supports --auto-correct.
967+
Rails/WhereNot:
968+
Exclude:
969+
- 'app/models/import.rb'
970+
- 'app/models/user.rb'
971+
- 'db/migrate/20130710182539_add_queries_visibility.rb'
972+
- 'test/unit/issue_test.rb'
973+
- 'test/unit/project_test.rb'
974+
- 'test/unit/user_test.rb'
975+
887976
Security/Eval:
888977
Exclude:
889978
- 'app/helpers/attachments_helper.rb'

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ group :test do
9494
# RuboCop
9595
gem 'rubocop', '~> 1.0.0'
9696
gem 'rubocop-performance', '~> 1.5.0'
97-
gem 'rubocop-rails', '~> 2.5.0'
97+
gem 'rubocop-rails', '~> 2.8.0'
9898
end
9999

100100
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")

0 commit comments

Comments
 (0)