diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-22 17:32:41 +0000 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-22 17:32:41 +0000 |
| commit | 931db7963ee9fa145d8fe2fb5eea209215227db7 (patch) | |
| tree | a85ddfcf479ea09237c54a6ce9b0557925f583ff /app/mailers | |
| parent | 0b402e11e355dc8d834fbc139f4bca810a9f766e (diff) | |
| parent | 33e4294fc884c7bd2a7fb86baf4731daf87db7bb (diff) | |
| download | gitlab-ce-api-notes-entity-fields.tar.gz | |
Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fields
# Conflicts:
# doc/api/v3_to_v4.md
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/pipelines.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/emails/pipelines.rb b/app/mailers/emails/pipelines.rb index 9460a6cd2be..f9f45ab987b 100644 --- a/app/mailers/emails/pipelines.rb +++ b/app/mailers/emails/pipelines.rb @@ -22,8 +22,8 @@ module Emails mail(bcc: recipients, subject: pipeline_subject(status), skip_premailer: true) do |format| - format.html { render layout: false } - format.text + format.html { render layout: 'mailer' } + format.text { render layout: 'mailer' } end end |