From 2913a93670b9c625e65644f3f555c6d30380397d Mon Sep 17 00:00:00 2001
From: Smriti Garg <sgarg@gitlab.com>
Date: Sat, 30 Sep 2023 05:47:08 +0000
Subject: [PATCH] Removed feature flag deactivation_email_additional_text
Feature flag has been enabled for an appropriate amount of time
in production and can now be safely removed from codebase
Changelog: removed
---
.../admin/application_settings/_email.html.haml | 11 +++++------
.../_user_deactivated_additional_text.html.haml | 2 +-
.../_user_deactivated_additional_text.text.erb | 2 +-
.../deactivation_email_additional_text.yml | 8 --------
doc/administration/settings/email.md | 1 +
spec/features/admin/admin_settings_spec.rb | 11 -----------
.../notify/user_deactivated_email.html.haml_spec.rb | 12 ------------
.../notify/user_deactivated_email.text.erb_spec.rb | 12 ------------
8 files changed, 8 insertions(+), 51 deletions(-)
delete mode 100644 config/feature_flags/development/deactivation_email_additional_text.yml
diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml
index ba1783770356..2d45391a8390 100644
--- a/app/views/admin/application_settings/_email.html.haml
+++ b/app/views/admin/application_settings/_email.html.haml
@@ -18,11 +18,10 @@
.form-group
= f.gitlab_ui_checkbox_component :user_deactivation_emails_enabled, _('Enable user deactivation emails'), help_text: _('Send emails to users upon account deactivation.')
- - if Feature.enabled?(:deactivation_email_additional_text)
- .form-group
- = f.label :deactivation_email_additional_text, _('Additional text for deactivation email')
- = f.text_area :deactivation_email_additional_text, class: 'form-control gl-form-input', rows: 4
- .form-text.text-muted
- = _('Text added to the body of user deactivation email messages. 1000 character limit.')
+ .form-group
+ = f.label :deactivation_email_additional_text, _('Additional text for deactivation email')
+ = f.text_area :deactivation_email_additional_text, class: 'form-control gl-form-input', rows: 4
+ .form-text.text-muted
+ = _('Text added to the body of user deactivation email messages. 1000 character limit.')
= f.submit _('Save changes'), pajamas_button: true, data: { testid: 'save-changes-button' }
diff --git a/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml b/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml
index cabdd4b09ec2..5104d4f6e117 100644
--- a/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml
+++ b/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml
@@ -1,3 +1,3 @@
-- return unless Feature.enabled?(:deactivation_email_additional_text) && Gitlab::CurrentSettings.deactivation_email_additional_text.present?
+- return unless Gitlab::CurrentSettings.deactivation_email_additional_text.present?
%p
= Gitlab::Utils.nlbr(Gitlab::CurrentSettings.deactivation_email_additional_text)
diff --git a/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb b/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb
index 5862c8059f9c..0de59fe7a75f 100644
--- a/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb
+++ b/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb
@@ -1,3 +1,3 @@
-<% return unless Feature.enabled?(:deactivation_email_additional_text) && Gitlab::CurrentSettings.deactivation_email_additional_text.present? %>
+<% return unless Gitlab::CurrentSettings.deactivation_email_additional_text.present? %>
<%= Gitlab::CurrentSettings.deactivation_email_additional_text %>
diff --git a/config/feature_flags/development/deactivation_email_additional_text.yml b/config/feature_flags/development/deactivation_email_additional_text.yml
deleted file mode 100644
index a603d4cd77ed..000000000000
--- a/config/feature_flags/development/deactivation_email_additional_text.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: deactivation_email_additional_text
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110033
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389538
-milestone: '15.9'
-type: development
-group: group::authentication and authorization
-default_enabled: true
diff --git a/doc/administration/settings/email.md b/doc/administration/settings/email.md
index c79394ee4079..bcf4bab6fc5a 100644
--- a/doc/administration/settings/email.md
+++ b/doc/administration/settings/email.md
@@ -93,6 +93,7 @@ To disable these notifications:
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/355964) in GitLab 15.9 [with a flag](../../administration/feature_flags.md) named `deactivation_email_additional_text`. Disabled by default.
> - [Enabled on self-managed and GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111882) in GitLab 15.9.
+> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/392761) in GitLab 16.5. Feature flag `deactivation_email_additional_text` removed.
FLAG:
On self-managed GitLab, by default this feature is available. To hide the feature, ask an
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index e87f47e52343..f372940a1e7f 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -883,12 +883,9 @@
context 'Preferences page' do
before do
- stub_feature_flags(deactivation_email_additional_text: deactivation_email_additional_text_feature_flag)
visit preferences_admin_application_settings_path
end
- let(:deactivation_email_additional_text_feature_flag) { true }
-
describe 'Email page' do
context 'when deactivation email additional text feature flag is enabled' do
it 'shows deactivation email additional text field' do
@@ -903,14 +900,6 @@
expect(current_settings.deactivation_email_additional_text).to eq('So long and thanks for all the fish!')
end
end
-
- context 'when deactivation email additional text feature flag is disabled' do
- let(:deactivation_email_additional_text_feature_flag) { false }
-
- it 'does not show deactivation email additional text field' do
- expect(page).not_to have_field 'Additional text for deactivation email'
- end
- end
end
it 'change Help page' do
diff --git a/spec/views/notify/user_deactivated_email.html.haml_spec.rb b/spec/views/notify/user_deactivated_email.html.haml_spec.rb
index 25d18e37cb9f..cc005fc0502c 100644
--- a/spec/views/notify/user_deactivated_email.html.haml_spec.rb
+++ b/spec/views/notify/user_deactivated_email.html.haml_spec.rb
@@ -28,18 +28,6 @@
expect(rendered).to have_content(/So long and thanks for all the fish!$/)
end
end
-
- context 'when additional text feature flag is disabled' do
- before do
- stub_feature_flags(deactivation_email_additional_text: false)
- end
-
- it 'does not display the additional text' do
- render
-
- expect(rendered).to have_content(/Please contact your GitLab administrator if you think this is an error\.$/)
- end
- end
end
context 'when additional text setting is not set' do
diff --git a/spec/views/notify/user_deactivated_email.text.erb_spec.rb b/spec/views/notify/user_deactivated_email.text.erb_spec.rb
index 8cf56816b926..60379714ff2a 100644
--- a/spec/views/notify/user_deactivated_email.text.erb_spec.rb
+++ b/spec/views/notify/user_deactivated_email.text.erb_spec.rb
@@ -30,18 +30,6 @@
expect(rendered).to have_content(/So long and thanks for all the fish!$/)
end
end
-
- context 'when additional text feature flag is disabled' do
- before do
- stub_feature_flags(deactivation_email_additional_text: false)
- end
-
- it 'does not display the additional text' do
- render
-
- expect(rendered).to have_content(/Please contact your GitLab administrator if you think this is an error\.$/)
- end
- end
end
context 'when additional text setting is not set' do
--
GitLab