diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-22 21:57:46 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-22 21:57:46 +0100 |
| commit | 850813d29867aac5935e1128880784f97071a6d8 (patch) | |
| tree | d5da375e2dcdaf54d653bc50aa75d2e4dd7f096e /config/application.rb | |
| parent | 2d64bda01f983c43f915e96bd5bf8fcb0790eb0e (diff) | |
| parent | 08b5bec2fa3beb2880d451a9d9270813b0a22519 (diff) | |
| download | gitlab-ce-850813d29867aac5935e1128880784f97071a6d8.tar.gz | |
Merge branch 'master' into filter-branch-by-name
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/application.rb b/config/application.rb index 50cc4235eda..06ebb14a5fe 100644 --- a/config/application.rb +++ b/config/application.rb @@ -81,10 +81,10 @@ module Gitlab config.assets.precompile << "print.css" config.assets.precompile << "notify.css" config.assets.precompile << "mailers/*.css" - config.assets.precompile << "graphs/application.js" - config.assets.precompile << "users/application.js" - config.assets.precompile << "network/application.js" - config.assets.precompile << "profile/application.js" + config.assets.precompile << "graphs/graphs_bundle.js" + config.assets.precompile << "users/users_bundle.js" + config.assets.precompile << "network/network_bundle.js" + config.assets.precompile << "profile/profile_bundle.js" config.assets.precompile << "lib/utils/*.js" config.assets.precompile << "lib/*.js" config.assets.precompile << "u2f.js" |