diff options
author | Robert Speicher <robert@gitlab.com> | 2017-03-18 02:06:12 +0300 |
---|---|---|
committer | DJ Mountney <david@twkie.net> | 2017-03-18 04:56:38 +0300 |
commit | f5c282bc33866aad33737dc5835657b0d634a0f5 (patch) | |
tree | 666439371bac94ec47d9ad84c79081936ee24d5e /app/mailers | |
parent | 461ea1e425979eaaea12c8ca7c767918c5b4ba54 (diff) |
Merge branch 'all-ci-offline-migrations' into 'master'
All CI offline migrations
See merge request !9730
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/emails/builds.rb | 30 | ||||
-rw-r--r-- | app/mailers/notify.rb | 1 |
2 files changed, 0 insertions, 31 deletions
diff --git a/app/mailers/emails/builds.rb b/app/mailers/emails/builds.rb deleted file mode 100644 index 3853af6201a..00000000000 --- a/app/mailers/emails/builds.rb +++ /dev/null @@ -1,30 +0,0 @@ -module Emails - module Builds - def build_fail_email(build_id, to) - @build = Ci::Build.find(build_id) - @project = @build.project - - add_project_headers - add_build_headers('failed') - - mail(to: to, subject: subject("Build failed for #{@project.name}", @build.short_sha)) - end - - def build_success_email(build_id, to) - @build = Ci::Build.find(build_id) - @project = @build.project - - add_project_headers - add_build_headers('success') - mail(to: to, subject: subject("Build success for #{@project.name}", @build.short_sha)) - end - - private - - def add_build_headers(status) - headers['X-GitLab-Build-Id'] = @build.id - headers['X-GitLab-Build-Ref'] = @build.ref - headers['X-GitLab-Build-Status'] = status.to_s - end - end -end diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 5b9226a6b81..14df6f8f0a3 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -6,7 +6,6 @@ class Notify < BaseMailer include Emails::Notes include Emails::Projects include Emails::Profile - include Emails::Builds include Emails::Pipelines include Emails::Members |