Skip to content
Snippets Groups Projects
Commit 85f7b7f8 authored by Luke Duncalfe's avatar Luke Duncalfe :red_circle:
Browse files

Del `ensure_verified_primary_email_for_2fa` flag

The flag was enabled by default.

Changelog: changed

#340151
#35102
parent cbc1b00b
No related branches found
No related tags found
No related merge requests found
......@@ -221,8 +221,6 @@ def groups_notification(groups)
end
def ensure_verified_primary_email
return unless Feature.enabled?(:ensure_verified_primary_email_for_2fa, default_enabled: :yaml)
unless current_user.two_factor_enabled? || current_user.primary_email_verified?
redirect_to profile_emails_path, notice: s_('You need to verify your primary email first before enabling Two-Factor Authentication.')
end
......
---
name: ensure_verified_primary_email_for_2fa
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69593
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340151
milestone: '14.3'
type: development
group: group::access
default_enabled: true
......@@ -45,9 +45,10 @@ There are multiple ways to enable two-factor authentication (2FA):
In GitLab 14.3 and later, your account email must be confirmed to enable two-factor authentication.
FLAG:
On self-managed GitLab, account email confirmation requirement is enabled. To disable this
On self-managed GitLab 14.3, account email confirmation requirement could be disabled. To disable this
restriction, ask an administrator to
[disable the `ensure_verified_primary_email_for_2fa` flag](../../../administration/feature_flags.md).
The flag [was removed](https://gitlab.com/gitlab-org/gitlab/-/issues/340151) in GitLab 14.4 and the feature is now generally available.
### One-time password
......
......@@ -27,12 +27,6 @@
expect(flash[:notice])
.to eq _('You need to verify your primary email first before enabling Two-Factor Authentication.')
end
it 'does not redirect when the `ensure_verified_primary_email_for_2fa` feature flag is disabled' do
stub_feature_flags(ensure_verified_primary_email_for_2fa: false)
expect(response).not_to redirect_to(profile_emails_path)
end
end
describe 'GET show' do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment