Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/admin/application_settings/_email.html.haml')
-rw-r--r--app/views/admin/application_settings/_email.html.haml13
1 files changed, 6 insertions, 7 deletions
diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml
index 65049fa5466..2d45391a839 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: { qa_selector: 'save_changes_button' }
+ = f.submit _('Save changes'), pajamas_button: true, data: { testid: 'save-changes-button' }