Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
d78272a1
Commit
d78272a1
authored
Dec 10, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a frozen string error in app/mailers/notify.rb
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
5a727a4d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/mailers/notify.rb
app/mailers/notify.rb
+1
-1
changelogs/unreleased/55104-frozenerror-can-t-modify-frozen-string.yml
...released/55104-frozenerror-can-t-modify-frozen-string.yml
+5
-0
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+2
-2
No files found.
app/mailers/notify.rb
View file @
d78272a1
...
@@ -166,7 +166,7 @@ class Notify < BaseMailer
...
@@ -166,7 +166,7 @@ class Notify < BaseMailer
headers
[
'In-Reply-To'
]
=
message_id
(
model
)
headers
[
'In-Reply-To'
]
=
message_id
(
model
)
headers
[
'References'
]
=
[
message_id
(
model
)]
headers
[
'References'
]
=
[
message_id
(
model
)]
headers
[
:subject
]
&
.
prepend
(
'Re: '
)
headers
[
:subject
]
=
"Re:
#{
headers
[
:subject
]
}
"
if
headers
[
:subject
]
mail_thread
(
model
,
headers
)
mail_thread
(
model
,
headers
)
end
end
...
...
changelogs/unreleased/55104-frozenerror-can-t-modify-frozen-string.yml
0 → 100644
View file @
d78272a1
---
title
:
Fix a frozen string error in app/mailers/notify.rb
merge_request
:
23683
author
:
type
:
fixed
spec/mailers/notify_spec.rb
View file @
d78272a1
...
@@ -28,8 +28,8 @@ describe Notify do
...
@@ -28,8 +28,8 @@ describe Notify do
end
end
def
have_referable_subject
(
referable
,
reply:
false
)
def
have_referable_subject
(
referable
,
reply:
false
)
prefix
=
referable
.
project
?
"
#{
referable
.
project
.
name
}
| "
:
''
prefix
=
(
referable
.
project
?
"
#{
referable
.
project
.
name
}
| "
:
''
).
freeze
prefix
.
prepend
(
'Re: '
)
if
reply
prefix
=
"Re:
#{
prefix
}
"
if
reply
suffix
=
"
#{
referable
.
title
}
(
#{
referable
.
to_reference
}
)"
suffix
=
"
#{
referable
.
title
}
(
#{
referable
.
to_reference
}
)"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment