diff --git a/ee/app/models/ee/user.rb b/ee/app/models/ee/user.rb index 3daed56e4068e891b9427c7d0f12e5cbe49adaa5..930bcf6e3f8d790789deb00b2f1ec54642ee4e1f 100644 --- a/ee/app/models/ee/user.rb +++ b/ee/app/models/ee/user.rb @@ -267,7 +267,7 @@ def use_separate_indices? end def should_use_security_policy_bot_avatar? - security_policy_bot? && ::Feature.enabled?(:security_policy_bot_shared_avatar, projects.first) + security_policy_bot? end def security_policy_bot_static_avatar_path(size = nil) diff --git a/ee/config/feature_flags/gitlab_com_derisk/security_policy_bot_shared_avatar.yml b/ee/config/feature_flags/gitlab_com_derisk/security_policy_bot_shared_avatar.yml deleted file mode 100644 index 691c17d8a22da4a8b3cd825ebc9d23f52ad650cc..0000000000000000000000000000000000000000 --- a/ee/config/feature_flags/gitlab_com_derisk/security_policy_bot_shared_avatar.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: security_policy_bot_shared_avatar -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/160803 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/475099 -milestone: '17.3' -type: gitlab_com_derisk -group: group::security policies -default_enabled: false diff --git a/ee/spec/models/ee/user_spec.rb b/ee/spec/models/ee/user_spec.rb index f2b861d3317dae3e05f598c44e81d39d218a629a..c4d922e9753587f11777c6fc0f70aadc698b964e 100644 --- a/ee/spec/models/ee/user_spec.rb +++ b/ee/spec/models/ee/user_spec.rb @@ -3527,17 +3527,7 @@ project.add_guest(user) end - context 'when feature flag `security_policy_bot_shared_avatar` is enabled' do - it { is_expected.to eq(true) } - end - - context 'when feature flag `security_policy_bot_shared_avatar` is disabled' do - before do - stub_feature_flags(security_policy_bot_shared_avatar: false) - end - - it { is_expected.to eq(false) } - end + it { is_expected.to eq(true) } end end