Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-12-10 17:37:42 +0300
committerDouwe Maan <douwe@gitlab.com>2018-12-10 17:37:42 +0300
commit80eebd8e33c5f2f26bc0fdd233d9d92c51edd242 (patch)
tree6cbfc605ce2bb61e73134a7cba00f068986f764f /app/mailers/notify.rb
parent42d37c1b06d7f4ab78c6230cfc535e26669e3360 (diff)
parentd78272a13b50e912b1ac946da8eec2e75bc6eb41 (diff)
Merge branch '55104-frozenerror-can-t-modify-frozen-string' into 'master'
Fix a frozen string error in app/mailers/notify.rb Closes #55104 See merge request gitlab-org/gitlab-ce!23683
Diffstat (limited to 'app/mailers/notify.rb')
-rw-r--r--app/mailers/notify.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 662f3e00047..88ad4c3e893 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -166,7 +166,7 @@ class Notify < BaseMailer
headers['In-Reply-To'] = message_id(model)
headers['References'] = [message_id(model)]
- headers[:subject]&.prepend('Re: ')
+ headers[:subject] = "Re: #{headers[:subject]}" if headers[:subject]
mail_thread(model, headers)
end