diff options
| author | hhoopes <heidih@gmail.com> | 2016-08-31 10:18:26 -0600 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-11-25 15:23:49 +0000 |
| commit | a761c59a6bfc4d66649910d01e4c8412bb0b40ec (patch) | |
| tree | c2c06dbbc20d140bda5ed2cd6abfa0e2f36805d0 /app/views/notify/note_merge_request_email.text.erb | |
| parent | f928dba99b0550cefa7534d7fd5bd1ea16609274 (diff) | |
| download | gitlab-ce-a761c59a6bfc4d66649910d01e4c8412bb0b40ec.tar.gz | |
Add keyword arguments to truncated_diff method
* Added keyword arguments to truncated_diff_lines method to allow for using highlighting or not (html templates vs. text)
* Tweaked templates for consistency and format appropriateness
Diffstat (limited to 'app/views/notify/note_merge_request_email.text.erb')
| -rw-r--r-- | app/views/notify/note_merge_request_email.text.erb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/app/views/notify/note_merge_request_email.text.erb b/app/views/notify/note_merge_request_email.text.erb index d24e15af91f..e33d15daded 100644 --- a/app/views/notify/note_merge_request_email.text.erb +++ b/app/views/notify/note_merge_request_email.text.erb @@ -1,11 +1,4 @@ -New comment for Merge Request <%= @merge_request.to_reference %> +<% url = url_for(namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")) %> -<%= url_for(namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")) %> - -<%= render 'simple_diff' if @discussion %> - -<% if current_application_settings.email_author_in_body %> - <%= @note.author_name %> wrote: -<% end %> - -<%= @note.note %> +New comment for Merge Request <%= @merge_request.to_reference -%> +<%= render partial: 'note_mr_or_commit_email', locals: { url: url }%> |