summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-19 00:08:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-19 00:08:30 +0000
commit8c80b21468c5c969644c9ea83fec7b43dba1eb3c (patch)
treeefdc69f22231ae472f0264dee21001e595c4f86d /app/helpers
parenta407a618ae21dce15c85ae15c465a531811a69b9 (diff)
downloadgitlab-ce-8c80b21468c5c969644c9ea83fec7b43dba1eb3c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 086c8abde6c..8c0a95b5fa8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -281,7 +281,7 @@ module ApplicationHelper
end
def startup_css_enabled?
- !params.has_key?(:no_startup_css)
+ !Feature.enabled?(:remove_startup_css) && !params.has_key?(:no_startup_css)
end
def sign_in_with_redirect?