summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-12-21 19:55:37 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2016-12-21 19:55:37 +0000
commit580220c6ccf2b541e46c4c8a1b3830195c3b5a8b (patch)
tree4e1ef65dc739f93ef78a6c92700fe63fcbdd3450 /config
parentf3f42f7b8f7a9e92af57e2becfc8411dafc31af6 (diff)
parent27c613cb1818f5bca695f667feb5ba12eee19d59 (diff)
downloadgitlab-ce-580220c6ccf2b541e46c4c8a1b3830195c3b5a8b.tar.gz
Merge branch 'backport-mr-widget-ci-js' into 'master'
Backport moving MR widget CI JS out of script tag See merge request !8200
Diffstat (limited to 'config')
-rw-r--r--config/application.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 057d60ca869..b5d89e9bafd 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -96,6 +96,7 @@ module Gitlab
config.assets.precompile << "profile/profile_bundle.js"
config.assets.precompile << "protected_branches/protected_branches_bundle.js"
config.assets.precompile << "diff_notes/diff_notes_bundle.js"
+ config.assets.precompile << "merge_request_widget/ci_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"