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
iv
gitlab-ce
Commits
ace9ff4a
Commit
ace9ff4a
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5305 from saymedia/master
Fix the sigil for merge request emails
parents
627cb28f
903090d1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/mailers/emails/notes.rb
app/mailers/emails/notes.rb
+1
-1
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+1
-1
No files found.
app/mailers/emails/notes.rb
View file @
ace9ff4a
...
...
@@ -18,7 +18,7 @@ module Emails
@note
=
Note
.
find
(
note_id
)
@merge_request
=
@note
.
noteable
@project
=
@note
.
project
mail
(
to:
recipient
(
recipient_id
),
subject:
subject
(
"note for merge request
!
#{
@merge_request
.
iid
}
"
))
mail
(
to:
recipient
(
recipient_id
),
subject:
subject
(
"note for merge request
#
#{
@merge_request
.
iid
}
"
))
end
def
note_wall_email
(
recipient_id
,
note_id
)
...
...
This diff is collapsed.
Click to expand it.
spec/mailers/notify_spec.rb
View file @
ace9ff4a
...
...
@@ -320,7 +320,7 @@ describe Notify do
it_behaves_like
'a note email'
it
'has the correct subject'
do
should
have_subject
/note for merge request
!
#{
merge_request
.
iid
}
/
should
have_subject
/note for merge request
#
#{
merge_request
.
iid
}
/
end
it
'contains a link to the merge request note'
do
...
...
This diff is collapsed.
Click to expand it.
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