diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-04 16:02:53 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-04 16:02:53 +0300 |
| commit | 487f78be129d44ae3dc098c9bd17925975435097 (patch) | |
| tree | 7236223f0c9076a123b63b8d76307ff75fdfdd7a /app/views/notify | |
| parent | bd002333004fc1e459f148111074459f7bc90147 (diff) | |
| parent | c586192813ad73e306a97b57f4cc97b00aaa6ca6 (diff) | |
| download | gitlab-ce-487f78be129d44ae3dc098c9bd17925975435097.tar.gz | |
Merge pull request #7677 from cirosantilli/factor-issue-mr-text-email
Fix missing to on reassign Merge Request text email to unassigned.
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/_reassigned_issuable_email.text.erb | 6 | ||||
| -rw-r--r-- | app/views/notify/reassigned_issue_email.text.erb | 6 | ||||
| -rw-r--r-- | app/views/notify/reassigned_merge_request_email.text.erb | 8 |
3 files changed, 8 insertions, 12 deletions
diff --git a/app/views/notify/_reassigned_issuable_email.text.erb b/app/views/notify/_reassigned_issuable_email.text.erb new file mode 100644 index 00000000000..817d030c362 --- /dev/null +++ b/app/views/notify/_reassigned_issuable_email.text.erb @@ -0,0 +1,6 @@ +Reassigned <%= issuable.class.model_name.human.titleize %> <%= issuable.iid %> + +<%= url_for([issuable.project, issuable, {only_path: false}]) %> + +Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee -%> + to <%= "#{issuable.assignee_id ? issuable.assignee_name : 'Unassigned'}" %> diff --git a/app/views/notify/reassigned_issue_email.text.erb b/app/views/notify/reassigned_issue_email.text.erb index 4becac2749c..710253be984 100644 --- a/app/views/notify/reassigned_issue_email.text.erb +++ b/app/views/notify/reassigned_issue_email.text.erb @@ -1,5 +1 @@ -Reassigned Issue <%= @issue.iid %> - -<%= url_for(project_issue_url(@issue.project, @issue)) %> - -Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= "#{@issue.assignee_id ? @issue.assignee_name : 'Unassigned'}" %> +<%= render 'reassigned_issuable_email', issuable: @issue %> diff --git a/app/views/notify/reassigned_merge_request_email.text.erb b/app/views/notify/reassigned_merge_request_email.text.erb index 87a7847e06d..b5b4f1ff99a 100644 --- a/app/views/notify/reassigned_merge_request_email.text.erb +++ b/app/views/notify/reassigned_merge_request_email.text.erb @@ -1,7 +1 @@ -Reassigned Merge Request #<%= @merge_request.iid %> - -<%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> - - -Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @merge_request.assignee_name %> - +<%= render 'reassigned_issuable_email', issuable: @merge_request %> |