Commit 3d6c0f6e authored by Tim Zallmann's avatar Tim Zallmann

Merge branch...

Merge branch '250643-discussions-json-doesn-t-appear-in-the-performance-bar-for-issues-epics-and-mrs' into 'master'

Resolve "discussions.json doesn't appear in the performance bar for issues, epics, and MRs"

See merge request gitlab-org/gitlab!43841
parents aa03fc2e efc1d745
......@@ -75,12 +75,12 @@
= javascript_include_tag locale_path unless I18n.locale == :en
= webpack_bundle_tag "sentry" if Gitlab.config.sentry.enabled
= webpack_bundle_tag 'performance_bar' if performance_bar_enabled?
- if content_for?(:page_specific_javascripts)
= yield :page_specific_javascripts
= webpack_controller_bundle_tags
= webpack_bundle_tag 'performance_bar' if performance_bar_enabled?
= webpack_bundle_tag "chrome_84_icon_fix" if browser.chrome?([">=84", "<84.0.4147.125"]) || browser.edge?([">=84", "<84.0.522.59"])
= yield :project_javascripts
......
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