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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
487aae1c
Commit
487aae1c
authored
May 10, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-reassigned-mr-email' into 'master'
Fix reassigned MR HTML email See merge request !11238
parents
e8563976
dd7c69da
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
19 deletions
+10
-19
app/views/notify/_reassigned_issuable_email.html.haml
app/views/notify/_reassigned_issuable_email.html.haml
+0
-10
app/views/notify/reassigned_merge_request_email.html.haml
app/views/notify/reassigned_merge_request_email.html.haml
+10
-9
No files found.
app/views/notify/_reassigned_issuable_email.html.haml
deleted
100644 → 0
View file @
e8563976
%p
Assignee changed
-
if
@previous_assignee
from
%strong
=
@previous_assignee
.
name
to
-
if
issuable
.
assignee_id
%strong
=
issuable
.
assignee_name
-
else
%strong
Unassigned
app/views/notify/reassigned_merge_request_email.html.haml
View file @
487aae1c
Reassigned Merge Request
#{
@merge_request
.
iid
}
=
url_for
([
@merge_request
.
project
.
namespace
.
becomes
(
Namespace
),
@merge_request
.
project
,
@merge_request
,
{
only_path:
false
}])
Assignee changed
-
if
@previous_assignee
from
#{
@previous_assignee
.
name
}
to
=
@merge_request
.
assignee_id
?
@merge_request
.
assignee_name
:
'Unassigned'
%p
Assignee changed
-
if
@previous_assignee
from
%strong
=
@previous_assignee
.
name
to
-
if
@merge_request
.
assignee_id
%strong
=
@merge_request
.
assignee_name
-
else
%strong
Unassigned
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