diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-14 14:38:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-14 14:38:55 +0000 |
| commit | b6ae2def2cb2b1da3ddcb3ceee556628a1147cc4 (patch) | |
| tree | 8e3511314feb1261bd28fc84a3710e5501238d72 /app/views/layouts | |
| parent | 33ccee239ebcac7785c1ad466c1624a43af99c90 (diff) | |
| parent | be08490863b76026b8f3ffbc422cb7f5d8b4a6a4 (diff) | |
| download | gitlab-ce-b6ae2def2cb2b1da3ddcb3ceee556628a1147cc4.tar.gz | |
Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master'
Unsubscribe from thread through link in email footer
Closes #3437
See merge request !2068
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/notify.html.haml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index 3ca4c340406..325c68c69dc 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -44,6 +44,10 @@ %br -# Don't link the host is the line below, one link in the email is easier to quickly click than two. You're receiving this email because of your account on #{Gitlab.config.gitlab.host}. - If you'd like to receive fewer emails, you can adjust your notification settings. + If you'd like to receive fewer emails, you can + - if @sent_notification && @sent_notification.unsubscribable? + = link_to "unsubscribe", unsubscribe_sent_notification_url(@sent_notification) + from this thread or + adjust your notification settings. - = email_action @target_url
\ No newline at end of file + = email_action @target_url |