Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-09 00:11:09 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-09 00:11:09 +0300
commit3d42e098d9658853984534c9dfc2bf76284a8ac0 (patch)
tree269e9d9e017124f5f6d841311661832ea7e4eff8 /app/helpers
parenta3487798aeff89daff78749e6d6f392d3ca23687 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/version_check_helper.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/version_check_helper.rb b/app/helpers/version_check_helper.rb
index 4bd89a3d4e2..1fec0a916b8 100644
--- a/app/helpers/version_check_helper.rb
+++ b/app/helpers/version_check_helper.rb
@@ -3,8 +3,6 @@
module VersionCheckHelper
include Gitlab::Utils::StrongMemoize
- SECURITY_ALERT_SEVERITY = 'danger'
-
def show_version_check?
return false unless Gitlab::CurrentSettings.version_check_enabled
return false if User.single_user&.requires_usage_stats_consent?
@@ -18,9 +16,9 @@ module VersionCheckHelper
strong_memoize_attr :gitlab_version_check
def show_security_patch_upgrade_alert?
- return false unless Feature.enabled?(:critical_security_alert) && show_version_check? && gitlab_version_check
+ return false unless show_version_check? && gitlab_version_check
- gitlab_version_check['severity'] === SECURITY_ALERT_SEVERITY
+ Gitlab::Utils.to_boolean(gitlab_version_check['critical_vulnerability'])
end
def link_to_version