diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-10-07 17:05:31 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-10-07 17:05:31 -0500 |
| commit | 1fe08610518858d86dddb1b118d121a138de3f84 (patch) | |
| tree | 5de331baec8ab434ffc109c982077a834b3f6164 | |
| parent | 9c931c63c9faad1f16d08aff001dc5e97cee1fda (diff) | |
| download | gitlab-ce-1fe08610518858d86dddb1b118d121a138de3f84.tar.gz | |
remove corporate address from email footer and add reference to domain of origin
4 files changed, 10 insertions, 2 deletions
diff --git a/app/views/notify/pipeline_failed_email.html.haml b/app/views/notify/pipeline_failed_email.html.haml index 3b3212e675e..a2ef4a92e03 100644 --- a/app/views/notify/pipeline_failed_email.html.haml +++ b/app/views/notify/pipeline_failed_email.html.haml @@ -173,4 +173,7 @@ %a{:href => profile_notifications_url, :style => "color:#3084bb;text-decoration:none;"} Manage all notifications · %a{:href => help_url, :style => "color:#3084bb;text-decoration:none;"} Help - %div GitLab, 1233 Howard St 2F, San Francisco, CA 94103, USA + %div + You're receiving this email because of your account on + = succeed "." do + %a{:href => root_url, :style => "color:#3084bb;text-decoration:none;"}= Gitlab.config.gitlab.host diff --git a/app/views/notify/pipeline_failed_email.text.erb b/app/views/notify/pipeline_failed_email.text.erb index 373d5020b28..56379411be4 100644 --- a/app/views/notify/pipeline_failed_email.text.erb +++ b/app/views/notify/pipeline_failed_email.text.erb @@ -26,5 +26,6 @@ Trace: <%= build.trace_with_state(last_lines: 10)[:text] %> <% end -%> +You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>. Manage all notifications: <%= profile_notifications_url %> Help: <%= help_url %> diff --git a/app/views/notify/pipeline_success_email.html.haml b/app/views/notify/pipeline_success_email.html.haml index ff9c3059acc..5425b638ac3 100644 --- a/app/views/notify/pipeline_success_email.html.haml +++ b/app/views/notify/pipeline_success_email.html.haml @@ -150,4 +150,7 @@ %a{:href => profile_notifications_url, :style => "color:#3084bb;text-decoration:none;"} Manage all notifications · %a{:href => help_url, :style => "color:#3084bb;text-decoration:none;"} Help - %div GitLab, 1233 Howard St 2F, San Francisco, CA 94103, USA + %div + You're receiving this email because of your account on + = succeed "." do + %a{:href => root_url, :style => "color:#3084bb;text-decoration:none;"}= Gitlab.config.gitlab.host diff --git a/app/views/notify/pipeline_success_email.text.erb b/app/views/notify/pipeline_success_email.text.erb index c38a738f523..29b290d9704 100644 --- a/app/views/notify/pipeline_success_email.text.erb +++ b/app/views/notify/pipeline_success_email.text.erb @@ -19,5 +19,6 @@ Commit Author: <%= commit.author.name %> ( <%= user_url(commit.author) %> ) <% stage_count = @pipeline.stages.size -%> Pipeline #<%= @pipeline.id %> ( <%= namespace_project_pipeline_url(@project.namespace, @project, @pipeline.id) %> ) successfully completed <%= build_count %> <%= 'build'.pluralize(build_count) %> in <%= stage_count %> <%= 'stage'.pluralize(stage_count) %>. +You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>. Manage all notifications: <%= profile_notifications_url %> Help: <%= help_url %> |