From 2fe36c41281252c5fb63ead8ec239c737a88468b Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 1 Sep 2024 00:38:01 +0000 Subject: [PATCH] Fix RuboCop offense Style/RedundantInterpolationUnfreeze (#39887). Since interpolated strings are always unfrozen in Ruby 3.0 and later, the use of `+""` is now redundant. git-svn-id: https://svn.redmine.org/redmine/trunk@23001 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/journals_controller.rb | 4 ++-- app/controllers/messages_controller.rb | 4 ++-- app/controllers/repositories_controller.rb | 2 +- app/helpers/application_helper.rb | 4 ++-- app/helpers/issues_helper.rb | 2 +- app/helpers/wiki_helper.rb | 2 +- app/models/issue.rb | 2 +- app/models/principal.rb | 2 +- lib/redmine/scm/adapters/subversion_adapter.rb | 14 +++++++------- lib/redmine/wiki_formatting/textile/redcloth3.rb | 14 +++++++------- test/unit/repository_test.rb | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index f7b821312..cbf545187 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -68,11 +68,11 @@ class JournalsController < ApplicationController if @journal user = @journal.user text = @journal.notes - @content = +"#{ll(Setting.default_language, :text_user_wrote_in, {:value => user, :link => "#note-#{params[:journal_indice]}"})}\n> " + @content = "#{ll(Setting.default_language, :text_user_wrote_in, {:value => user, :link => "#note-#{params[:journal_indice]}"})}\n> " else user = @issue.author text = @issue.description - @content = +"#{ll(Setting.default_language, :text_user_wrote, user)}\n> " + @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " end # Replaces pre blocks with [...] text = text.to_s.strip.gsub(%r{
(.*?)
}m, '[...]') diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 769cdff67..5050d94a7 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -120,9 +120,9 @@ class MessagesController < ApplicationController @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:') if @message.root == @message - @content = +"#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> " + @content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> " else - @content = +"#{ll(Setting.default_language, :text_user_wrote_in, {:value => @message.author, :link => "message##{@message.id}"})}\n> " + @content = "#{ll(Setting.default_language, :text_user_wrote_in, {:value => @message.author, :link => "message##{@message.id}"})}\n> " end @content << @message.content.to_s.strip.gsub(%r{
(.*?)
}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 08fa8c2d1..9be7878ce 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -264,7 +264,7 @@ class RepositoriesController < ApplicationController if params[:format] == 'diff' @diff = @repository.diff(@path, @rev, @rev_to) (show_error_not_found; return) unless @diff - filename = +"changeset_r#{@rev}" + filename = "changeset_r#{@rev}" filename << "_r#{@rev_to}" if @rev_to send_data @diff.join, :filename => "#{filename}.diff", :type => 'text/x-patch', diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5e873fe62..49e8b0a82 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -361,7 +361,7 @@ module ApplicationHelper end def toggle_link(name, id, options={}) - onclick = +"$('##{id}').toggle(); " + onclick = "$('##{id}').toggle(); " onclick << (options[:focus] ? "$('##{options[:focus]}:visible').focus(); " : "this.blur(); ") onclick << "$(window).scrollTop($('##{options[:focus]}').position().top); " if options[:scroll] onclick << "return false;" @@ -1479,7 +1479,7 @@ module ApplicationHelper div_class = +'toc' div_class << ' right' if right_align div_class << ' left' if left_align - out = +"