diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-28 21:34:31 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-28 21:34:31 +0000 |
| commit | c8ad9fec22d28d23b9b26c3d11b202ae28b70905 (patch) | |
| tree | 80d98d0fb7fdf8e4e7e201767f47bab531a3d411 /config/application.rb | |
| parent | f4fed44f6700aed93015dfeac0ade00a93e8288d (diff) | |
| parent | 88b5afe2ca5fbc8249794f142d2be516cb3538f1 (diff) | |
| download | gitlab-ce-c8ad9fec22d28d23b9b26c3d11b202ae28b70905.tar.gz | |
Merge branch 'cycle-analytics-bundle' into 'master'
Create cycle analytics bundle
## What does this MR do?
Currently the cycle analytics file is being included in our application.js file & therefore including VueJS in application.js. This MR creates a cycle analytics bundle and only includes it on the cycle analytics page.
See merge request !7176
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 92c8467e7f4..946b632b0e8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -91,6 +91,7 @@ module Gitlab config.assets.precompile << "protected_branches/protected_branches_bundle.js" config.assets.precompile << "diff_notes/diff_notes_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" config.assets.precompile << "boards/test_utils/simulate_drag.js" config.assets.precompile << "blob_edit/blob_edit_bundle.js" |