summaryrefslogtreecommitdiff
path: root/app/views/layouts/mailer
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-06-01 14:21:32 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-06-13 22:36:45 +0200
commit16f64dfe8c2b86c2f15770fa1a0bc0bcc9fbba19 (patch)
treeda0aaac10d07f0debb9a668f20553d073fd05ecd /app/views/layouts/mailer
parent96e5837b02528a3b4651af920ed59829e2009ef3 (diff)
downloadgitlab-ce-16f64dfe8c2b86c2f15770fa1a0bc0bcc9fbba19.tar.gz
inline the only once used template
Diffstat (limited to 'app/views/layouts/mailer')
-rw-r--r--app/views/layouts/mailer/_default_content.html.haml3
-rw-r--r--app/views/layouts/mailer/devise.html.haml5
2 files changed, 3 insertions, 5 deletions
diff --git a/app/views/layouts/mailer/_default_content.html.haml b/app/views/layouts/mailer/_default_content.html.haml
deleted file mode 100644
index 88e00b909eb..00000000000
--- a/app/views/layouts/mailer/_default_content.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-%tr
- %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 5px;text-align:center;" }
- = yield
diff --git a/app/views/layouts/mailer/devise.html.haml b/app/views/layouts/mailer/devise.html.haml
index 6f15f427369..7ff2eed3fa2 100644
--- a/app/views/layouts/mailer/devise.html.haml
+++ b/app/views/layouts/mailer/devise.html.haml
@@ -1,3 +1,4 @@
= render layout: 'layouts/mailer' do
- = render layout: 'layouts/mailer/default_content' do
- = yield
+ %tr
+ %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 5px;text-align:center;" }
+ = yield