summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.rubocop.yml4
-rw-r--r--.rubocop_todo.yml25
-rw-r--r--Gemfile3
3 files changed, 27 insertions, 5 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 2d84c4347..52c0b7508 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,8 +16,8 @@ AllCops:
# Enable extensions
-Rails:
- Enabled: true
+require:
+ - rubocop-rails
# Rules for Redmine
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d84065936..d1d6eb0e9 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -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
@@ -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'
@@ -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
@@ -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
diff --git a/Gemfile b/Gemfile
index 4b7350e40..37449f09f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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")