From a4d1a8b0de324ba21669431efc4d0e35ac7b9f54 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 9 Feb 2023 18:34:04 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-7-stable-ee --- app/helpers/version_check_helper.rb | 2 +- .../development/critical_security_alert.yml | 8 ++++++++ spec/helpers/version_check_helper_spec.rb | 21 ++++++++++++++------- 3 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 config/feature_flags/development/critical_security_alert.yml diff --git a/app/helpers/version_check_helper.rb b/app/helpers/version_check_helper.rb index 0bb92dfd118..4bd89a3d4e2 100644 --- a/app/helpers/version_check_helper.rb +++ b/app/helpers/version_check_helper.rb @@ -18,7 +18,7 @@ module VersionCheckHelper strong_memoize_attr :gitlab_version_check def show_security_patch_upgrade_alert? - return false unless show_version_check? && gitlab_version_check + return false unless Feature.enabled?(:critical_security_alert) && show_version_check? && gitlab_version_check gitlab_version_check['severity'] === SECURITY_ALERT_SEVERITY end diff --git a/config/feature_flags/development/critical_security_alert.yml b/config/feature_flags/development/critical_security_alert.yml new file mode 100644 index 00000000000..6bb5100efc8 --- /dev/null +++ b/config/feature_flags/development/critical_security_alert.yml @@ -0,0 +1,8 @@ +--- +name: critical_security_alert +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108732 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387719 +milestone: '15.8' +type: development +group: group::distribution +default_enabled: false diff --git a/spec/helpers/version_check_helper_spec.rb b/spec/helpers/version_check_helper_spec.rb index 2bb85e7b6b8..c76eb08820a 100644 --- a/spec/helpers/version_check_helper_spec.rb +++ b/spec/helpers/version_check_helper_spec.rb @@ -49,19 +49,26 @@ RSpec.describe VersionCheckHelper do describe '#show_security_patch_upgrade_alert?' do describe 'return conditions' do - where(:show_version_check, :gitlab_version_check, :result) do + where(:feature_enabled, :show_version_check, :gitlab_version_check, :result) do [ - [false, nil, false], - [false, { "severity" => "success" }, false], - [false, { "severity" => "danger" }, false], - [true, nil, false], - [true, { "severity" => "success" }, false], - [true, { "severity" => "danger" }, true] + [false, false, nil, false], + [false, false, { "severity" => "success" }, false], + [false, false, { "severity" => "danger" }, false], + [false, true, nil, false], + [false, true, { "severity" => "success" }, false], + [false, true, { "severity" => "danger" }, false], + [true, false, nil, false], + [true, false, { "severity" => "success" }, false], + [true, false, { "severity" => "danger" }, false], + [true, true, nil, false], + [true, true, { "severity" => "success" }, false], + [true, true, { "severity" => "danger" }, true] ] end with_them do before do + stub_feature_flags(critical_security_alert: feature_enabled) allow(helper).to receive(:show_version_check?).and_return(show_version_check) allow(helper).to receive(:gitlab_version_check).and_return(gitlab_version_check) end -- cgit v1.2.1