diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 20:11:16 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 20:11:16 +0000 |
| commit | 529cf138a18b33aea35aab5a7b72f705df5e2982 (patch) | |
| tree | 51214908dadf3725b78c52ea96c3dda6da0a6515 | |
| parent | 7bc48f7b1f16290c29de7a822dfd07fda7079e6e (diff) | |
| parent | d8bc6423121174ebe8145e90f511ad8cc88dc1c6 (diff) | |
| download | gitlab-ce-529cf138a18b33aea35aab5a7b72f705df5e2982.tar.gz | |
Merge branch 'mail-footer-text' into 'master'
Change email footer text
Old:
> You're receiving this notification because you are a member of the GitLab.org / GitLab Community Edition project team.
New:
> You're receiving this notification because you've contributed to the GitLab.org / GitLab Community Edition project.
See merge request !1409
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/layouts/notify.html.haml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 33451e51ad1..9a269652f66 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,7 @@ v 8.1.0 (unreleased) - Improve error message when merging fails - Add support of multibyte characters in LDAP UID (Roman Petrov) - Show additions/deletions stats on merge request diff + - Remove footer text in emails (Zeger-Jan van de Weg) v 8.0.3 - Fix URL shown in Slack notifications diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index ec209c38eed..2f7d7e86f56 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -42,5 +42,3 @@ - else #{link_to "View it on GitLab", @target_url} = email_action @target_url - - if @project && !@disable_footer - You're receiving this notification because you are a member of the #{link_to_unless @target_url, @project.name_with_namespace, namespace_project_url(@project.namespace, @project)} project team. |