diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-12 17:23:19 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-12 17:23:19 -0500 |
| commit | c770201061c5d39e6e297951badfafc8ddf14906 (patch) | |
| tree | 72da00c88358d605f33c983945dd7e1565956c47 /app/views/notify | |
| parent | 9d9b7212bc5fe04e64a0a034a412f5d92cc96151 (diff) | |
| parent | 11eefba891f214eefc1efa334adbcc9e979c0ce3 (diff) | |
| download | gitlab-ce-c770201061c5d39e6e297951badfafc8ddf14906.tar.gz | |
Merge branch 'master' into diff-line-comment-vuejs
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/new_issue_email.text.erb | 2 | ||||
| -rw-r--r-- | app/views/notify/new_merge_request_email.text.erb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/views/notify/new_issue_email.text.erb b/app/views/notify/new_issue_email.text.erb index fc64c98038b..ca5c2f2688c 100644 --- a/app/views/notify/new_issue_email.text.erb +++ b/app/views/notify/new_issue_email.text.erb @@ -3,3 +3,5 @@ New Issue was created. Issue <%= @issue.iid %>: <%= url_for(namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue)) %> Author: <%= @issue.author_name %> Assignee: <%= @issue.assignee_name %> + +<%= @issue.description %> diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb index d4aad8d1862..3c8f178ac77 100644 --- a/app/views/notify/new_merge_request_email.text.erb +++ b/app/views/notify/new_merge_request_email.text.erb @@ -6,3 +6,5 @@ New Merge Request <%= @merge_request.to_reference %> Author: <%= @merge_request.author_name %> Assignee: <%= @merge_request.assignee_name %> +<%= @merge_request.description %> + |