diff options
| author | Regis <boudinot.regis@yahoo.com> | 2016-12-23 16:34:56 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2016-12-23 16:34:56 -0700 |
| commit | 71d731a21b96cdd9d1881a8e03961f7008cb8d64 (patch) | |
| tree | f31b57dde85b65345733b4bcd3915bab37236e47 /config/application.rb | |
| parent | 115536fbfa9904cef459bb735d29f20756887ebe (diff) | |
| parent | 21fb690c216f9e40be07229726e106d7016e13fc (diff) | |
| download | gitlab-ce-71d731a21b96cdd9d1881a8e03961f7008cb8d64.tar.gz | |
merge master and fix application.rb conflict
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 57503c60391..1de7fb7bdb8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -83,6 +83,7 @@ module Gitlab # Enable the asset pipeline config.assets.enabled = true config.assets.paths << Gemojione.images_path + config.assets.paths << "vendor/assets/fonts" config.assets.precompile << "*.png" config.assets.precompile << "print.css" config.assets.precompile << "notify.css" @@ -96,6 +97,7 @@ module Gitlab config.assets.precompile << "profile/profile_bundle.js" config.assets.precompile << "protected_branches/protected_branches_bundle.js" config.assets.precompile << "diff_notes/diff_notes_bundle.js" + config.assets.precompile << "merge_request_widget/ci_bundle.js" config.assets.precompile << "boards/boards_bundle.js" config.assets.precompile << "cycle_analytics/cycle_analytics_bundle.js" config.assets.precompile << "merge_conflicts/merge_conflicts_bundle.js" @@ -109,6 +111,7 @@ module Gitlab config.assets.precompile << "u2f.js" config.assets.precompile << "vue_pipelines_index/index.js" config.assets.precompile << "vue_pagination/index.js" + config.assets.precompile << "vendor/assets/fonts/*" # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' |