Commit 4b7e5399 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '258972-remove-unnecessary-content-for-check' into 'master'

Remove unnecessary content_for? checks

Closes #258972

See merge request gitlab-org/gitlab!43856
parents 86d71acb aecc7db7
...@@ -50,13 +50,11 @@ ...@@ -50,13 +50,11 @@
= render 'layouts/startup_css' = render 'layouts/startup_css'
- if user_application_theme == 'gl-dark' - if user_application_theme == 'gl-dark'
= stylesheet_link_tag_defer "application_dark" = stylesheet_link_tag_defer "application_dark"
- if content_for?(:page_specific_styles) = yield :page_specific_styles
= yield :page_specific_styles
= stylesheet_link_tag_defer "application_utilities_dark" = stylesheet_link_tag_defer "application_utilities_dark"
- else - else
= stylesheet_link_tag_defer "application" = stylesheet_link_tag_defer "application"
- if content_for?(:page_specific_styles) = yield :page_specific_styles
= yield :page_specific_styles
= stylesheet_link_tag_defer "application_utilities" = stylesheet_link_tag_defer "application_utilities"
- unless use_startup_css? - unless use_startup_css?
= stylesheet_link_tag_defer "themes/#{user_application_theme_css_filename}" if user_application_theme_css_filename = stylesheet_link_tag_defer "themes/#{user_application_theme_css_filename}" if user_application_theme_css_filename
...@@ -70,15 +68,11 @@ ...@@ -70,15 +68,11 @@
= Gon::Base.render_data(nonce: content_security_policy_nonce) = Gon::Base.render_data(nonce: content_security_policy_nonce)
- if content_for?(:library_javascripts)
= yield :library_javascripts
= javascript_include_tag locale_path unless I18n.locale == :en = javascript_include_tag locale_path unless I18n.locale == :en
= webpack_bundle_tag "sentry" if Gitlab.config.sentry.enabled = webpack_bundle_tag "sentry" if Gitlab.config.sentry.enabled
= webpack_bundle_tag 'performance_bar' if performance_bar_enabled? = webpack_bundle_tag 'performance_bar' if performance_bar_enabled?
- if content_for?(:page_specific_javascripts) = yield :page_specific_javascripts
= yield :page_specific_javascripts
= webpack_controller_bundle_tags = webpack_controller_bundle_tags
= webpack_bundle_tag "chrome_84_icon_fix" if browser.chrome?([">=84", "<84.0.4147.125"]) || browser.edge?([">=84", "<84.0.522.59"]) = webpack_bundle_tag "chrome_84_icon_fix" if browser.chrome?([">=84", "<84.0.4147.125"]) || browser.edge?([">=84", "<84.0.522.59"])
......
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
= stylesheet_link_tag 'https://unpkg.com/@atlaskit/reduced-ui-pack@10.5.5/dist/bundle.css' = stylesheet_link_tag 'https://unpkg.com/@atlaskit/reduced-ui-pack@10.5.5/dist/bundle.css'
= javascript_include_tag 'https://connect-cdn.atl-paas.net/all.js' = javascript_include_tag 'https://connect-cdn.atl-paas.net/all.js'
= javascript_include_tag 'https://unpkg.com/jquery@3.3.1/dist/jquery.min.js' = javascript_include_tag 'https://unpkg.com/jquery@3.3.1/dist/jquery.min.js'
- if content_for?(:page_specific_styles) = yield :page_specific_styles
= yield :page_specific_styles
= yield :head = yield :head
%body %body
.ac-content .ac-content
......
- page_title _("CI Lint") - page_title _("CI Lint")
- page_description _("Validate your GitLab CI configuration file") - page_description _("Validate your GitLab CI configuration file")
- unless Feature.enabled?(:monaco_ci, default_enabled: true) - unless Feature.enabled?(:monaco_ci, default_enabled: true)
- content_for :library_javascripts do - content_for :page_specific_javascripts do
= page_specific_javascript_tag('lib/ace.js') = page_specific_javascript_tag('lib/ace.js')
%h2.pt-3.pb-3= _("Validate your GitLab CI configuration") %h2.pt-3.pb-3= _("Validate your GitLab CI configuration")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment