summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-02-01 21:34:01 -0600
committerMike Greiling <mike@pixelcog.com>2018-02-01 21:34:01 -0600
commitac85d98cc3c08c56ae02158effa1e59739ba3485 (patch)
tree941bccbcbbc67b7f546b711a1d7d779ad2d514ea
parentf0fe736e322377ee15859bbb2a21fb0de4c5d2fd (diff)
downloadgitlab-ce-ac85d98cc3c08c56ae02158effa1e59739ba3485.tar.gz
move auto-generated bundle script tags after manual page-specific webpack bundles
-rw-r--r--app/views/layouts/_head.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 1403c8329c8..3fbdb4b9463 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -41,13 +41,14 @@
= webpack_bundle_tag "webpack_runtime"
= webpack_bundle_tag "common"
= webpack_bundle_tag "main"
- = webpack_controller_bundle_tags
= webpack_bundle_tag "raven" if current_application_settings.clientside_sentry_enabled
= webpack_bundle_tag "test" if Rails.env.test?
- if content_for?(:page_specific_javascripts)
= yield :page_specific_javascripts
+ = webpack_controller_bundle_tags
+
= yield :project_javascripts
= csrf_meta_tags