Skip to content

Commit

Permalink
Update RuboCop to 0.72.0 (#31509).
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.redmine.org/redmine/trunk@18320 e93f8b46-1217-0410-a6f0-8f06a7374b81
  • Loading branch information
vividtone committed Jun 26, 2019
1 parent f016a82 commit bd6cfb1
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ AllCops:

# Enable extensions

Rails:
Enabled: true
require:
- rubocop-rails

# Rules for Redmine

Expand Down
25 changes: 23 additions & 2 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --no-offense-counts --no-auto-gen-timestamp`
# using RuboCop version 0.71.0.
# using RuboCop version 0.72.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -313,7 +313,7 @@ Layout/IndentHeredoc:

# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: normal, rails
# SupportedStyles: normal, indented_internal_methods
Layout/IndentationConsistency:
Exclude:
- 'app/models/attachment.rb'
Expand Down Expand Up @@ -1009,6 +1009,26 @@ Rails/HasManyOrHasOneDependent:
- 'app/models/tracker.rb'
- 'app/models/wiki.rb'

# Configuration parameters: Include.
# Include: app/helpers/**/*.rb
Rails/HelperInstanceVariable:
Exclude:
- 'app/helpers/application_helper.rb'
- 'app/helpers/attachments_helper.rb'
- 'app/helpers/context_menus_helper.rb'
- 'app/helpers/imports_helper.rb'
- 'app/helpers/issues_helper.rb'
- 'app/helpers/journals_helper.rb'
- 'app/helpers/projects_helper.rb'
- 'app/helpers/queries_helper.rb'
- 'app/helpers/repositories_helper.rb'
- 'app/helpers/search_helper.rb'
- 'app/helpers/sort_helper.rb'
- 'app/helpers/timelog_helper.rb'
- 'app/helpers/users_helper.rb'
- 'app/helpers/versions_helper.rb'
- 'app/helpers/workflows_helper.rb'

# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: numeric, symbolic
Expand Down Expand Up @@ -1353,6 +1373,7 @@ Style/IdenticalConditionalBranches:
- 'config/initializers/10-patches.rb'
- 'lib/redmine/wiki_formatting/textile/redcloth3.rb'

# Configuration parameters: AllowIfModifier.
Style/IfInsideElse:
Enabled: false

Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ group :test do
gem "capybara", '~> 2.13'
gem "selenium-webdriver"
# RuboCop
gem 'rubocop', '~> 0.71.0'
gem 'rubocop', '~> 0.72.0'
gem 'rubocop-rails', '~> 2.1.0'
end

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

0 comments on commit bd6cfb1

Please sign in to comment.