Browse Source

Update RuboCop Rails to 2.12 (#35207).


git-svn-id: http://svn.redmine.org/redmine/trunk@21307 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/5.0.0
Go MAEDA 2 years ago
parent
commit
11d88cb7c4
2 changed files with 17 additions and 8 deletions
  1. 16
    7
      .rubocop_todo.yml
  2. 1
    1
      Gemfile

+ 16
- 7
.rubocop_todo.yml View File

@@ -12,11 +12,6 @@
Layout/ArgumentAlignment:
Enabled: false

# Cop supports --auto-correct.
Layout/ClosingParenthesisIndentation:
Exclude:
- 'app/helpers/journals_helper.rb'

# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: leading, trailing
@@ -580,7 +575,6 @@ Performance/RedundantSplitRegexpArgument:
- 'lib/redmine/wiki_formatting/textile/redcloth3.rb'

# Cop supports --auto-correct.
# Configuration parameters: AutoCorrect.
Performance/StringInclude:
Exclude:
- 'test/functional/versions_controller_test.rb'
@@ -660,7 +654,8 @@ Rails/Blank:

# Cop supports --auto-correct.
Rails/ContentTag:
Enabled: false
Exclude:
- 'lib/redmine/wiki_formatting/markdown/formatter.rb'

# Configuration parameters: Include.
# Include: db/migrate/*.rb
@@ -770,10 +765,15 @@ Rails/HasManyOrHasOneDependent:
- 'app/models/document_category.rb'
- 'app/models/issue_priority.rb'
- 'app/models/issue_status.rb'
- 'app/models/principal.rb'
- 'app/models/project.rb'
- 'app/models/repository.rb'
- 'app/models/repository/mercurial.rb'
- 'app/models/time_entry_activity.rb'
- 'app/models/tracker.rb'
- 'app/models/user.rb'
- 'app/models/wiki.rb'
- 'app/models/wiki_page.rb'

# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
@@ -855,6 +855,7 @@ Rails/MatchRoute:
Rails/NegateInclude:
Enabled: false

# Cop supports --auto-correct.
# Configuration parameters: Include.
# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
Rails/Output:
@@ -931,6 +932,14 @@ Rails/RedundantForeignKey:
- 'app/models/query.rb'
- 'app/models/role.rb'

# Cop supports --auto-correct.
# Configuration parameters: Include.
# Include: spec/**/*.rb, test/**/*.rb
Rails/RedundantTravelBack:
Exclude:
- 'test/integration/sudo_mode_test.rb'
- 'test/system/sudo_mode_test.rb'

Rails/ReflectionClassName:
Exclude:
- 'lib/redmine/nested_set/issue_nested_set.rb'

+ 1
- 1
Gemfile View File

@@ -106,7 +106,7 @@ group :test do
# RuboCop
gem 'rubocop', '~> 1.23.0'
gem 'rubocop-performance', '~> 1.12.0'
gem 'rubocop-rails', '~> 2.11.0'
gem 'rubocop-rails', '~> 2.12.4'
end

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

Loading…
Cancel
Save