summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.rubocop.yml3
-rw-r--r--.rubocop_todo.yml4
-rw-r--r--Gemfile2
3 files changed, 6 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 63f7e6a68..5b287ff5e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -94,6 +94,9 @@ Lint/StructNewOverride:
Lint/SuppressedException:
AllowComments: true
+Layout/LineContinuationLeadingSpace:
+ Enabled: false
+
Layout/TrailingWhitespace:
AllowInHeredoc: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f473760dc..c6669cb7a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --exclude-limit 20 --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.30.1.
+# using RuboCop version 1.31.1.
# 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
@@ -808,7 +808,7 @@ Rails/InverseOf:
- 'app/models/wiki_page.rb'
# Configuration parameters: Include.
-# Include: app/controllers/**/*.rb
+# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
Rails/LexicallyScopedActionFilter:
Exclude:
- 'app/controllers/projects_controller.rb'
diff --git a/Gemfile b/Gemfile
index 3527a0a1b..563a65ca9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ group :test do
gem "selenium-webdriver", "~> 3.142.7"
gem 'webdrivers', '4.6.1', require: false
# RuboCop
- gem 'rubocop', '~> 1.30.1'
+ gem 'rubocop', '~> 1.31.1'
gem 'rubocop-performance', '~> 1.14.2'
gem 'rubocop-rails', '~> 2.15.0'
end