gitlab-org--gitlab-foss/app/views/notify/new_merge_request_email.htm...

- if Gitlab::CurrentSettings.email_author_in_body
  %p.details
    #{link_to @merge_request.author_name, user_url(@merge_request.author)} created a merge request:

%p.details
  = merge_path_description(@merge_request, '→')

- if @merge_request.assignees.any?
  %p
    = assignees_label(@merge_request)

= render_if_exists 'notify/merge_request_approvers', presenter: @mr_presenter

- if @merge_request.description
  %div
    = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author)
use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 13:39:55 -05:00			`- if Gitlab::CurrentSettings.email_author_in_body`
Add specs 2017-03-17 15:25:52 -04:00			`%p.details`
			`#{link_to @merge_request.author_name, user_url(@merge_request.author)} created a merge request:`

Simplify the default layout of notification emails * Less margin: the content appears as the text of the message. * Streamlined footer: everything on one line, with a small separator. * Zimbra (www.zimbra.com) chokes on HTML tables, and doesn't display the content of the message. Switching to a simpler layout fixes the issue. 2014-02-18 08:27:39 -05:00			`%p.details`
Escape path in new merge request mail 2019-04-16 09:29:37 -04:00			`= merge_path_description(@merge_request, '→')`
Notification when created merge request 2011-12-17 11:07:28 -05:00
[CE] Support multiple assignees for merge requests Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder). 2019-04-07 14:35:16 -04:00			`- if @merge_request.assignees.any?`
Add the description to the "new issue" and "new merge request" emails Previously the content of the issue or merge request was missing from the email. 2014-02-18 08:44:00 -05:00			`%p`
[CE] Support multiple assignees for merge requests Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder). 2019-04-07 14:35:16 -04:00			`= assignees_label(@merge_request)`
Add the description to the "new issue" and "new merge request" emails Previously the content of the issue or merge request was missing from the email. 2014-02-18 08:44:00 -05:00
Ports new refactor from EE to CE 2018-09-14 11:59:28 -04:00			`= render_if_exists 'notify/merge_request_approvers', presenter: @mr_presenter`
Remove EE-specific code from new MR email 2018-06-12 06:37:12 -04:00
HAMLLint: Fix `SpaceBeforeScript` offences 2016-12-23 05:27:41 -05:00			`- if @merge_request.description`
Add specs 2017-03-17 15:25:52 -04:00			`%div`
			`= markdown(@merge_request.description, pipeline: :email, author: @merge_request.author)`