diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-15 01:06:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-15 01:06:19 +0300 |
| commit | a16072c2f88191585b0a69825b4b0fe53984cc80 (patch) | |
| tree | acc57b77209fd7a54512e75324b174e4cff6198a /app/helpers | |
| parent | 045e5c9a98f55302c35a50ff184d436ca3c3c0e3 (diff) | |
Add latest changes from gitlab-org/gitlab@15-8-stable-ee
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/version_check_helper.rb | 6 |
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 |