From 0ead0ea43eff258e8e44dffb7ce5457d92745578 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Fri, 4 Aug 2017 16:09:25 +0100 Subject: [PATCH] Fix order of CI lint ace editor loading Closes #35985 --- app/views/ci/lints/show.html.haml | 2 +- app/views/layouts/_head.html.haml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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"