summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-08-04 16:09:25 +0100
committerPhil Hughes <me@iamphill.com>2017-08-04 16:39:01 +0100
commit0ead0ea43eff258e8e44dffb7ce5457d92745578 (patch)
tree7229af047439ba94177533e849a22b3bffbf6049
parent83dafcb58101953ef0a3ff591922840c7b6a080f (diff)
downloadgitlab-ce-ci-lint-fix.tar.gz
Fix order of CI lint ace editor loadingci-lint-fix
Closes #35985
-rw-r--r--app/views/ci/lints/show.html.haml2
-rw-r--r--app/views/layouts/_head.html.haml3
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/ci/lints/show.html.haml b/app/views/ci/lints/show.html.haml
index dfbc7772698..e6408f35201 100644
--- a/app/views/ci/lints/show.html.haml
+++ b/app/views/ci/lints/show.html.haml
@@ -1,6 +1,6 @@
- page_title "CI Lint"
- page_description "Validate your GitLab CI configuration file"
-- content_for :page_specific_javascripts do
+- content_for :library_javascripts do
= page_specific_javascript_tag('lib/ace.js')
%h2 Check your .gitlab-ci.yml
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 6ad22958df3..3babdae3968 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -38,6 +38,9 @@
= Gon::Base.render_data
+ - if content_for?(:library_javascripts)
+ = yield :library_javascripts
+
= webpack_bundle_tag "webpack_runtime"
= webpack_bundle_tag "common"
= webpack_bundle_tag "locale"