diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-15 06:43:51 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-15 06:43:51 +0000 |
| commit | 28dc04aac24002f67b1bec5912255f1f6843e4f0 (patch) | |
| tree | e3382a6e41f1e265145e0676a88e3148c46229eb | |
| parent | 47f0a8dbddc5e2cf86cf4b92b9c7c2fca6d97539 (diff) | |
| parent | f8b97b454b8eae343bd7ea6e92fd2257eeae45b0 (diff) | |
| download | gitlab-ce-28dc04aac24002f67b1bec5912255f1f6843e4f0.tar.gz | |
Merge branch 'view-link-first' into 'master'
View link first
See merge request !1397
| -rw-r--r-- | app/views/layouts/notify.html.haml | 4 | ||||
| -rw-r--r-- | lib/tasks/gitlab/mail_google_schema_whitelisting.rake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index da451961327..e81cf9e5bf6 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -24,8 +24,8 @@ %p \— %br - - if @project - You're receiving this notification because you are a member of the #{link_to_unless @target_url, @project.name_with_namespace, project_url(@project)} project team. - if @target_url #{link_to "View it on GitLab", @target_url} = email_action @target_url + - if @project + You're receiving this notification because you are a member of the #{link_to_unless @target_url, @project.name_with_namespace, project_url(@project)} project team. diff --git a/lib/tasks/gitlab/mail_google_schema_whitelisting.rake b/lib/tasks/gitlab/mail_google_schema_whitelisting.rake index f40bba24da8..102c6ae55d5 100644 --- a/lib/tasks/gitlab/mail_google_schema_whitelisting.rake +++ b/lib/tasks/gitlab/mail_google_schema_whitelisting.rake @@ -54,8 +54,8 @@ namespace :gitlab do <div class='footer' style='margin-top: 10px;'> <p> <br> - You're receiving this notification because you are a member of the Base / Rails Project project team. <a href=\"#{url}\">View it on GitLab</a> + You're receiving this notification because you are a member of the Base / Rails Project project team. #{schema} </p> </div> |