From 51ac77af9a9bd70297ae6dd8c0290c73a46d8bf8 Mon Sep 17 00:00:00 2001 From: Heinrich Lee Yu Date: Wed, 12 Dec 2018 17:51:36 +0800 Subject: Add date range to milestone changed emails Also refactored issues and MRs to use the same email template file --- app/views/notify/changed_milestone_email.html.haml | 5 +++++ app/views/notify/changed_milestone_email.text.erb | 1 + app/views/notify/changed_milestone_issue_email.html.haml | 3 --- app/views/notify/changed_milestone_issue_email.text.erb | 1 - app/views/notify/changed_milestone_merge_request_email.html.haml | 3 --- app/views/notify/changed_milestone_merge_request_email.text.erb | 1 - 6 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 app/views/notify/changed_milestone_email.html.haml create mode 100644 app/views/notify/changed_milestone_email.text.erb delete mode 100644 app/views/notify/changed_milestone_issue_email.html.haml delete mode 100644 app/views/notify/changed_milestone_issue_email.text.erb delete mode 100644 app/views/notify/changed_milestone_merge_request_email.html.haml delete mode 100644 app/views/notify/changed_milestone_merge_request_email.text.erb (limited to 'app/views/notify') diff --git a/app/views/notify/changed_milestone_email.html.haml b/app/views/notify/changed_milestone_email.html.haml new file mode 100644 index 00000000000..01d27cac36b --- /dev/null +++ b/app/views/notify/changed_milestone_email.html.haml @@ -0,0 +1,5 @@ +%p + Milestone changed to + %strong= link_to(@milestone.name, @milestone_url) + - if date_range = milestone_date_range(@milestone) + = "(#{date_range})" diff --git a/app/views/notify/changed_milestone_email.text.erb b/app/views/notify/changed_milestone_email.text.erb new file mode 100644 index 00000000000..a466da4eb19 --- /dev/null +++ b/app/views/notify/changed_milestone_email.text.erb @@ -0,0 +1 @@ +Milestone changed to <%= @milestone.name %><% if date_range = milestone_date_range(@milestone) %> (<%= date_range %>)<% end %> ( <%= @milestone_url %> ) diff --git a/app/views/notify/changed_milestone_issue_email.html.haml b/app/views/notify/changed_milestone_issue_email.html.haml deleted file mode 100644 index 7d5425fc72d..00000000000 --- a/app/views/notify/changed_milestone_issue_email.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -%p - Milestone changed to - %strong= link_to(@milestone.name, @milestone_url) diff --git a/app/views/notify/changed_milestone_issue_email.text.erb b/app/views/notify/changed_milestone_issue_email.text.erb deleted file mode 100644 index c5fc0b61518..00000000000 --- a/app/views/notify/changed_milestone_issue_email.text.erb +++ /dev/null @@ -1 +0,0 @@ -Milestone changed to <%= @milestone.name %> ( <%= @milestone_url %> ) diff --git a/app/views/notify/changed_milestone_merge_request_email.html.haml b/app/views/notify/changed_milestone_merge_request_email.html.haml deleted file mode 100644 index 7d5425fc72d..00000000000 --- a/app/views/notify/changed_milestone_merge_request_email.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -%p - Milestone changed to - %strong= link_to(@milestone.name, @milestone_url) diff --git a/app/views/notify/changed_milestone_merge_request_email.text.erb b/app/views/notify/changed_milestone_merge_request_email.text.erb deleted file mode 100644 index c5fc0b61518..00000000000 --- a/app/views/notify/changed_milestone_merge_request_email.text.erb +++ /dev/null @@ -1 +0,0 @@ -Milestone changed to <%= @milestone.name %> ( <%= @milestone_url %> ) -- cgit v1.2.3