diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-20 12:26:53 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-07-20 12:26:53 +0000 |
| commit | 812bb8b4388662e2c471dd689421a64daaededfb (patch) | |
| tree | 41dba64ef0e8d00d65857a36ad6b69f08c8b50c8 /config/application.rb | |
| parent | 8e6fa5937be35b3b1c0907911ec9a961ccd23935 (diff) | |
| parent | ec8a25ba0b1b7cff6f432cb77574cfc181bea012 (diff) | |
| download | gitlab-ce-812bb8b4388662e2c471dd689421a64daaededfb.tar.gz | |
Merge branch 'rename-js-files' into 'master'
Replace namespace-specific application.js files with namespace-bundle.js files.
Following up on the per-page JavaScript improvements, I wanted to replace the use of `application.js` with `namespace-bundle.js` to prevent confusion when downloading more than one application.js file.
This is pretty much just for the sake of clarity.
cc: @alfredo1
See merge request !5221
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" |