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 | |
| 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
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js.es6 (renamed from app/assets/javascripts/cycle_analytics.js.es6) | 0 | ||||
| -rw-r--r-- | app/views/projects/cycle_analytics/show.html.haml | 4 | ||||
| -rw-r--r-- | config/application.rb | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index efa5a213570..ef6bb64215b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Add hover to trash icon in notes !7008 (blackst0ne) - Only show one error message for an invalid email !5905 (lycoperdon) - Fix sidekiq stats in admin area (blackst0ne) + - Created cycle analytics bundle JavaScript file - API: Fix booleans not recognized as such when using the `to_boolean` helper - Removed delete branch tooltip !6954 - Stop unauthorized users dragging on milestone page (blackst0ne) diff --git a/app/assets/javascripts/cycle_analytics.js.es6 b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js.es6 index 331f0209888..331f0209888 100644 --- a/app/assets/javascripts/cycle_analytics.js.es6 +++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js.es6 diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml index b647882efa0..247d612ba6f 100644 --- a/app/views/projects/cycle_analytics/show.html.haml +++ b/app/views/projects/cycle_analytics/show.html.haml @@ -1,5 +1,9 @@ - @no_container = true - page_title "Cycle Analytics" + +- content_for :page_specific_javascripts do + = page_specific_javascript_tag('cycle_analytics/cycle_analytics_bundle.js') + = render "projects/pipelines/head" #cycle-analytics{class: container_class, "v-cloak" => "true", data: { request_path: project_cycle_analytics_path(@project) }} 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" |