diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 12:09:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 12:09:55 +0300 |
| commit | d06c308380072db8cfac10f27fc114f6093ce8b6 (patch) | |
| tree | 5d54d354c496afb31d28cc93c728a95e6d014fe3 /app/helpers/application_helper.rb | |
| parent | fb10c412ec153dd64a9c5ce98e6c6091621e62c2 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3b061ce2e67..41b20a1d9a0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -236,7 +236,7 @@ module ApplicationHelper end def use_startup_css? - params[:startup_css] == 'true' || cookies['startup_css'] == 'true' + Feature.enabled?(:startup_css) && !Rails.env.test? end def stylesheet_link_tag_defer(path) |