diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-11-11 13:41:12 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-11-11 13:41:12 +0000 |
| commit | fdad3842a608450a3810d1aafa041ff40bf46046 (patch) | |
| tree | 7281031b4f066778e5a69aab73698fcc3908a018 /app/views/layouts | |
| parent | fb5c3c70216d7a1151fa4ec767cd034bbb435587 (diff) | |
| parent | 26fab9cb95bda08a044f5500ef0b74854b293a54 (diff) | |
| download | gitlab-ce-fdad3842a608450a3810d1aafa041ff40bf46046.tar.gz | |
Merge branch 'add-comment-to-one-link-in-email-to-prevent-people-adding-it-back' into 'master'
Prevent people from adding the link back.
See merge request !1938
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/notify.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index f58b9bd6ba6..3ca4c340406 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -42,7 +42,8 @@ - else #{link_to "View it on GitLab", @target_url}. %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. - = email_action @target_url + = email_action @target_url
\ No newline at end of file |