diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-21 10:46:37 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-21 10:46:37 +0000 |
| commit | 17de30f412b5eddaa080006b6dd2aae2bd2d5647 (patch) | |
| tree | f4866e69fb2a5a868e580bc5eb10aa8195e46449 /config | |
| parent | b9fb48bc4597984710532e20f057920b0915d0c3 (diff) | |
| parent | afbcdd8e7fce5b9a530368ad3dd19292d05008f7 (diff) | |
| download | gitlab-ce-17de30f412b5eddaa080006b6dd2aae2bd2d5647.tar.gz | |
Merge branch 'backport-ee-premailer' into 'master'
Backport premailer and diff changes from EE
Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
See merge request !3318
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/initializers/premailer.rb | 7 |
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 +) |