Commit 48e31125 authored by Sean McGivern's avatar Sean McGivern

Add text version of unapproval email

parent f92fd303
......@@ -58,7 +58,6 @@ module Emails
setup_merge_request_mail(merge_request_id, recipient_id)
@approved_by = User.find(approved_by_user_id)
@approved_by_users = @merge_request.approved_by_users.map(&:name)
mail_answer_thread(@merge_request, merge_request_thread_options(approved_by_user_id, recipient_id))
end
......@@ -66,7 +65,6 @@ module Emails
setup_merge_request_mail(merge_request_id, recipient_id)
@unapproved_by = User.find(unapproved_by_user_id)
@unapproved_by_users = @merge_request.approved_by_users.map(&:name)
mail_answer_thread(@merge_request, merge_request_thread_options(approved_by_user_id, recipient_id))
end
......
= "Merge Request #{@merge_request.to_reference} was approved by #{@approved_by_users.to_sentence}"
= "Merge Request #{@merge_request.to_reference} was approved by #{@approved_by_user}"
Merge Request url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}
......
= "Merge Request #{@merge_request.to_reference} was unapproved by #{@unapproved_by_user}"
Merge Request url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}
= merge_path_description(@merge_request, 'to')
Author: #{@merge_request.author_name}
Assignee: #{@merge_request.assignee_name}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment