diff options
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 939e86409db..16c57b572a5 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -835,6 +835,33 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord false end + # Overriding the enum check for `email_confirmation_setting` as the feature flag is being removed and is taking a + # release M, M.N+1 strategy as noted in: + # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107302#note_1286005956 + def email_confirmation_setting_off? + if Feature.enabled?(:soft_email_confirmation) + false + else + super + end + end + + def email_confirmation_setting_soft? + if Feature.enabled?(:soft_email_confirmation) + true + else + super + end + end + + def email_confirmation_setting_hard? + if Feature.enabled?(:soft_email_confirmation) + false + else + super + end + end + private def parsed_grafana_url |