kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ci-lint-fix' into 'master' 

Fix order of CI lint ace editor loading

Closes #35985

See merge request !13316
This commit is contained in:
Tim Zallmann 2017-08-06 06:13:00 +00:00
parent 9b93508028 0ead0ea43e
commit 4b3011e1c2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/ci/lints/show.html.haml
View File

@ -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

3
app/views/layouts/_head.html.haml
View File

@ -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"