summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-01-28 17:54:13 +0100
committerDouwe Maan <douwe@selenight.nl>2016-03-19 20:04:10 +0100
commita8aa59e96ef64a11073d7c84a9af93077f98bf8a (patch)
tree12c521bbf5fc005a88c62cbaeeafb547c107fe9b /config
parent0ce7c1e494403cba995b77cd9dec09d79256d13d (diff)
downloadgitlab-ce-a8aa59e96ef64a11073d7c84a9af93077f98bf8a.tar.gz
Inline mailer CSS using premailer.
# Conflicts: # Gemfile.lock
Diffstat (limited to 'config')
-rw-r--r--config/application.rb1
-rw-r--r--config/initializers/premailer.rb7
2 files changed, 8 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 2b103c4592d..5a0ac70aa2a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -49,6 +49,7 @@ module Gitlab
config.assets.paths << Gemojione.index.images_path
config.assets.precompile << "*.png"
config.assets.precompile << "print.css"
+ config.assets.precompile << "notify.css"
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
diff --git a/config/initializers/premailer.rb b/config/initializers/premailer.rb
new file mode 100644
index 00000000000..a44316bc3a4
--- /dev/null
+++ b/config/initializers/premailer.rb
@@ -0,0 +1,7 @@
+# See https://github.com/fphilipe/premailer-rails#configuration
+Premailer::Rails.config.merge!(
+ generate_text_part: false,
+ preserve_styles: true,
+ remove_comments: true,
+ remove_ids: true
+)