diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-12-21 11:24:08 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-12-21 11:24:08 +0000 |
| commit | 1567f17941df86164fcf0c39e0be5771b15f6b97 (patch) | |
| tree | db6a6460915a79c1e2eed3e1c76bdbab06e212fa /app/views/notify | |
| parent | 3a401448d7027849520985980907787ea21d7243 (diff) | |
| parent | a412bcff45ca64d1035a8c6583dceab4d9598508 (diff) | |
| download | gitlab-ce-1567f17941df86164fcf0c39e0be5771b15f6b97.tar.gz | |
Merge branch '53933-include-dates-in-milestone-change-email' into 'master'
Add date range to milestone changed emails
Closes #53933
See merge request gitlab-org/gitlab-ce!23762
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 %> ) |