diff options
| author | dixpac <dino.onex@gmail.com> | 2016-08-04 11:53:23 +0200 |
|---|---|---|
| committer | dixpac <dino.onex@gmail.com> | 2016-08-04 14:29:47 +0200 |
| commit | b3a9ad6a57d34632cd011b242faad4584c25274f (patch) | |
| tree | 4731ecd20d98b90235527147facc789f35ed4d3f | |
| parent | b2d142c4a026b479925482c4756172d86888198b (diff) | |
| download | gitlab-ce-b3a9ad6a57d34632cd011b242faad4584c25274f.tar.gz | |
Add description to text/plain emails
Added to
* new_issue_email
* new_merge_request_email
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -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 |
3 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index b36997dcba9..c6efbfa7ea4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -66,6 +66,7 @@ v 8.11.0 (unreleased) - Sensible state specific default sort order for issues and merge requests !5453 (tomb0y) - Fix RequestProfiler::Middleware error when code is reloaded in development - Catch what warden might throw when profiling requests to re-throw it + - Add description to new_issue email and new_merge_request_email in text/plain content type. !5663 (dixpac) - Speed up and reduce memory usage of Commit#repo_changes, Repository#expire_avatar_cache and IrkerWorker v 8.10.4 (unreleased) 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 %> + |