diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-21 19:32:37 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-21 19:32:37 +0100 |
| commit | 6e5461c6ee8b408e35324b32c0b5ba99328ec763 (patch) | |
| tree | f233cbfad4cd0773e7d0b30f057fed0076fee91d /config | |
| parent | d28a587e82836d28524339586e1b6c1546a4bff5 (diff) | |
| parent | 2bcbc7c6db934d56448c4c261861e62982b9b573 (diff) | |
| download | gitlab-ce-6e5461c6ee8b408e35324b32c0b5ba99328ec763.tar.gz | |
Merge branch 'master' into 2489-soft-delete-issues
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 +) |