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, '&rarr;')

- if @merge_request.assignee_id.present?
  %p
    Assignee: #{@merge_request.assignee_name}

- 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`
Update emails to describe path using for_fork? Forked MR's will print Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch> Non forked MR's will print Branch <source_branch> -> <target_branch> Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038 2013-07-17 10:35:11 -04:00			`!= merge_path_description(@merge_request, '→')`
Notification when created merge request 2011-12-17 11:07:28 -05:00
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			`- if @merge_request.assignee_id.present?`
			`%p`
Add specs 2017-03-17 15:25:52 -04:00			`Assignee: #{@merge_request.assignee_name}`
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
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)`