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

Merge branch 'cycle-analytics-bundle' into 'master'
c8ad9fec · Fatih Acet · f4fed44f · 88b5afe2 · c8ad9fec · c8ad9fec
Commit c8ad9fec authored Oct 28, 2016 by Fatih Acet
4 changed files
--- 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)

--- a/app/assets/javascripts/cycle_analytics.js.es6
+++ b/app/assets/javascripts/cycle_analytics.js.es6
--- a/app/views/projects/cycle_analytics/show.html.haml
+++ b/app/views/projects/cycle_analytics/show.html.haml
 - @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) }}

--- 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"