diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-08-06 06:13:00 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-08-06 06:13:00 +0000 |
| commit | 4b3011e1c20077470ce946d703d98259f88ef268 (patch) | |
| tree | 9bd50e3ffc75e6c324ec466965403cab769e17b6 | |
| parent | 9b93508028e9e0a8ed0f4cbc9f20de568e31cac9 (diff) | |
| parent | 0ead0ea43eff258e8e44dffb7ce5457d92745578 (diff) | |
| download | gitlab-ce-4b3011e1c20077470ce946d703d98259f88ef268.tar.gz | |
Merge branch 'ci-lint-fix' into 'master'
Fix order of CI lint ace editor loading
Closes #35985
See merge request !13316
| -rw-r--r-- | app/views/ci/lints/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/_head.html.haml | 3 |
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" |