diff options
| author | Balasankar C <balasankar@gitlab.com> | 2017-05-19 02:04:22 +0530 |
|---|---|---|
| committer | Balasankar C <balasankar@gitlab.com> | 2017-05-19 02:04:22 +0530 |
| commit | ef923bbda9a81c7df1bf0445645dd5b5794fec02 (patch) | |
| tree | 9e6f329f00564ece43893518f89f61914867a954 | |
| parent | dd35bd2d3535283ab70c6f80c27f0a0fa2a78ccf (diff) | |
| download | gitlab-ce-32531-mr-ressign-email-notification-language.tar.gz | |
Improve language of email notifications of MR and Issue reassignment32531-mr-ressign-email-notification-language
| -rw-r--r-- | app/views/notify/reassigned_issue_email.text.erb | 7 | ||||
| -rw-r--r-- | app/views/notify/reassigned_merge_request_email.text.erb | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/app/views/notify/reassigned_issue_email.text.erb b/app/views/notify/reassigned_issue_email.text.erb index 6c357f1074a..d513e9adc36 100644 --- a/app/views/notify/reassigned_issue_email.text.erb +++ b/app/views/notify/reassigned_issue_email.text.erb @@ -1,6 +1 @@ -Reassigned Issue <%= @issue.iid %> - -<%= url_for([@issue.project.namespace.becomes(Namespace), @issue.project, @issue, { only_path: false }]) %> - -Assignee changed <%= "from #{@previous_assignees.map(&:name).to_sentence}" if @previous_assignees.any? -%> - to <%= "#{@issue.assignees.any? ? @issue.assignee_list : 'Unassigned'}" %> +Assignee of Issue <%= @issue.iid %> ( <%= url_for([@issue.project.namespace.becomes(Namespace), @issue.project, @issue, { only_path: false }]) %> ) changed <%= "from #{@previous_assignees.map(&:name).to_sentence}" if @previous_assignees.any? -%> to <%= "#{@issue.assignees.any? ? @issue.assignee_list : 'Unassigned'}" %> diff --git a/app/views/notify/reassigned_merge_request_email.text.erb b/app/views/notify/reassigned_merge_request_email.text.erb index 998a40fefde..bd2d3fac268 100644 --- a/app/views/notify/reassigned_merge_request_email.text.erb +++ b/app/views/notify/reassigned_merge_request_email.text.erb @@ -1,6 +1 @@ -Reassigned Merge Request <%= @merge_request.iid %> - -<%= url_for([@merge_request.project.namespace.becomes(Namespace), @merge_request.project, @merge_request, { only_path: false }]) %> - -Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee -%> - to <%= "#{@merge_request.assignee_id ? @merge_request.assignee_name : 'Unassigned'}" %> +Assignee of Merge Request <%= @merge_request.iid %> ( <%= url_for([@merge_request.project.namespace.becomes(Namespace), @merge_request.project, @merge_request, { only_path: false }]) %> ) changed <%= "from #{@previous_assignee.name}" if @previous_assignee -%> to <%= "#{@merge_request.assignee_id ? @merge_request.assignee_name : 'Unassigned'}" %> |