diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2018-12-12 17:51:36 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-12-21 18:00:14 +0800 |
| commit | 51ac77af9a9bd70297ae6dd8c0290c73a46d8bf8 (patch) | |
| tree | 80f309b336f92f7d841129d67bcbbe93f9db45dd /app/views/notify | |
| parent | 62d250ff666770f9807eec2199a7b208ea8b518a (diff) | |
| download | gitlab-ce-51ac77af9a9bd70297ae6dd8c0290c73a46d8bf8.tar.gz | |
Add date range to milestone changed emails
Also refactored issues and MRs to use the same email template file
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/changed_milestone_email.html.haml (renamed from app/views/notify/changed_milestone_issue_email.html.haml) | 2 | ||||
| -rw-r--r-- | app/views/notify/changed_milestone_email.text.erb | 1 | ||||
| -rw-r--r-- | app/views/notify/changed_milestone_issue_email.text.erb | 1 | ||||
| -rw-r--r-- | app/views/notify/changed_milestone_merge_request_email.html.haml | 3 | ||||
| -rw-r--r-- | app/views/notify/changed_milestone_merge_request_email.text.erb | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/app/views/notify/changed_milestone_issue_email.html.haml b/app/views/notify/changed_milestone_email.html.haml index 7d5425fc72d..01d27cac36b 100644 --- a/app/views/notify/changed_milestone_issue_email.html.haml +++ b/app/views/notify/changed_milestone_email.html.haml @@ -1,3 +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.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 %> ) |