summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authordixpac <dino.onex@gmail.com>2016-08-04 11:53:23 +0200
committerdixpac <dino.onex@gmail.com>2016-08-04 14:29:47 +0200
commitb3a9ad6a57d34632cd011b242faad4584c25274f (patch)
tree4731ecd20d98b90235527147facc789f35ed4d3f /app
parentb2d142c4a026b479925482c4756172d86888198b (diff)
downloadgitlab-ce-b3a9ad6a57d34632cd011b242faad4584c25274f.tar.gz
Add description to text/plain emails
Added to * new_issue_email * new_merge_request_email
Diffstat (limited to 'app')
-rw-r--r--app/views/notify/new_issue_email.text.erb2
-rw-r--r--app/views/notify/new_merge_request_email.text.erb2
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 %>
+