summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2025-04-12 02:07:11 +0000
committerGo MAEDA <maeda@farend.jp>2025-04-12 02:07:11 +0000
commita08ce1c54f71c6209182b8c1919e64f3616c6416 (patch)
treedfe50b0bd04856b3ad5e7fa46457388f086cebd1
parent1d0a389b408000c3e9efa0c938161d2db71c0016 (diff)
downloadredmine-a08ce1c54f71c6209182b8c1919e64f3616c6416.tar.gz
redmine-a08ce1c54f71c6209182b8c1919e64f3616c6416.zip
Update RuboCop to 1.75 (#41884).
git-svn-id: https://svn.redmine.org/redmine/trunk@23638 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--.rubocop_todo.yml7
-rw-r--r--Gemfile2
-rw-r--r--app/helpers/application_helper.rb2
3 files changed, 6 insertions, 5 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3e5e246b9..ee4544cc6 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.74.0.
+# using RuboCop version 1.75.2.
# 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
@@ -289,8 +289,9 @@ Naming/MemoizedInstanceVariableName:
- 'lib/redmine/field_format.rb'
- 'lib/redmine/search.rb'
-# Configuration parameters: EnforcedStyle, AllowedPatterns.
+# Configuration parameters: EnforcedStyle, AllowedPatterns, ForbiddenIdentifiers, ForbiddenPatterns.
# SupportedStyles: snake_case, camelCase
+# ForbiddenIdentifiers: __id__, __send__
Naming/MethodName:
Exclude:
- 'lib/redmine/export/pdf.rb'
@@ -987,7 +988,7 @@ Style/NestedTernaryOperator:
- 'app/models/journal.rb'
# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, MinBodyLength.
+# Configuration parameters: EnforcedStyle, MinBodyLength, AllowConsecutiveConditionals.
# SupportedStyles: skip_modifier_ifs, always
Style/Next:
Enabled: false
diff --git a/Gemfile b/Gemfile
index 9e2608e2a..df1d06f7e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -111,7 +111,7 @@ group :test do
gem "capybara", ">= 3.39"
gem 'selenium-webdriver', '>= 4.11.0'
# RuboCop
- gem 'rubocop', '~> 1.74.0', require: false
+ gem 'rubocop', '~> 1.75.2', require: false
gem 'rubocop-performance', '~> 1.23.0', require: false
gem 'rubocop-rails', '~> 2.29.0', require: false
gem 'bundle-audit', require: false
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9bb26bdec..aa12831e6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1607,7 +1607,7 @@ module ApplicationHelper
# Helper to render JSON in views
def raw_json(arg)
- arg.to_json.to_s.gsub('/', '\/').html_safe
+ arg.to_json.gsub('/', '\/').html_safe
end
def back_url_hidden_field_tag