diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 12:10:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 12:10:16 +0300 |
| commit | 2c49951e8c1f4fb95d15cac3dd0677d6882d2add (patch) | |
| tree | acca123398daa394dd9810ac47ac07319c53e9a9 /app/helpers/application_helper.rb | |
| parent | fb553bbc1899eddaddb07cd9685cdabffbed9962 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 41b20a1d9a0..09f21e4b727 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -236,12 +236,12 @@ module ApplicationHelper end def use_startup_css? - Feature.enabled?(:startup_css) && !Rails.env.test? + (Feature.enabled?(:startup_css) || params[:startup_css] == 'true' || cookies['startup_css'] == 'true') && !Rails.env.test? end def stylesheet_link_tag_defer(path) if use_startup_css? - stylesheet_link_tag(path, media: "print") + stylesheet_link_tag(path, media: "print", crossorigin: ActionController::Base.asset_host ? 'anonymous' : nil) else stylesheet_link_tag(path, media: "all") end |