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
17821419
Commit
17821419
authored
Jun 12, 2018
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove EE-specific code from new MR email
parent
a286a024
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
7 deletions
+10
-7
app/views/notify/new_merge_request_email.html.haml
app/views/notify/new_merge_request_email.html.haml
+1
-3
app/views/notify/new_merge_request_email.text.erb
app/views/notify/new_merge_request_email.text.erb
+1
-4
ee/app/views/notify/_merge_request_approvers.html.haml
ee/app/views/notify/_merge_request_approvers.html.haml
+5
-0
ee/app/views/notify/_merge_request_approvers.text.erb
ee/app/views/notify/_merge_request_approvers.text.erb
+3
-0
No files found.
app/views/notify/new_merge_request_email.html.haml
View file @
17821419
...
...
@@ -9,9 +9,7 @@
%p
Assignee:
#{
@merge_request
.
assignee_name
}
-
if
@merge_request
.
approvers
.
any?
%p
Approvers:
#{
render_items_list
(
@merge_request
.
approvers_left
.
map
(
&
:name
))
}
=
render_if_exists
'notify/merge_request_approvers'
,
merge_request:
@merge_request
-
if
@merge_request
.
description
%div
...
...
app/views/notify/new_merge_request_email.text.erb
View file @
17821419
...
...
@@ -5,9 +5,6 @@ New Merge Request <%= @merge_request.to_reference %>
<%=
merge_path_description
(
@merge_request
,
'to'
)
%>
Author:
<%=
@merge_request
.
author_name
%>
Assignee:
<%=
@merge_request
.
assignee_name
%>
<%
if
@merge_request
.
approvers
.
any?
%>
Approvers:
<%=
render_items_list
(
@merge_request
.
approvers_left
.
map
(
&
:name
))
%>
<%
end
%>
<%=
render_if_exists
'notify/merge_request_approvers'
,
merge_request:
@merge_request
%>
<%=
@merge_request
.
description
%>
ee/app/views/notify/_merge_request_approvers.html.haml
0 → 100644
View file @
17821419
-
merge_request
=
local_assigns
.
fetch
(
:merge_request
)
-
return
unless
merge_request
.
approvers
.
any?
%p
Approvers:
#{
render_items_list
(
merge_request
.
approvers_left
.
map
(
&
:name
))
}
ee/app/views/notify/_merge_request_approvers.text.erb
0 → 100644
View file @
17821419
<%-
merge_request
=
local_assigns
.
fetch
(
:merge_request
)
-%>
<%-
return
unless
merge_request
.
approvers
.
any?
-%>
Approvers:
<%=
render_items_list
(
merge_request
.
approvers_left
.
map
(
&
:name
))
%>
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