diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-05 15:11:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-05 15:11:04 +0300 |
| commit | 164ac94bbd2eadc02ab54322a6fe12ed48ae8041 (patch) | |
| tree | 6eec29a4fd554eeb6f4a1b296e37bdf6fb5f6f80 /app/views/admin/application_settings | |
| parent | 8934df30a36d16ac9de9aebb079e16f16fda6912 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin/application_settings')
| -rw-r--r-- | app/views/admin/application_settings/_email.html.haml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml index 2f31eb5f6d1..65049fa5466 100644 --- a/app/views/admin/application_settings/_email.html.haml +++ b/app/views/admin/application_settings/_email.html.haml @@ -16,9 +16,6 @@ = render_if_exists 'admin/application_settings/email_additional_text_setting', form: f .form-group - = f.gitlab_ui_checkbox_component :in_product_marketing_emails_enabled, _('Enable in-product marketing emails'), help_text: _('Send emails to help guide new users through the onboarding process.') - - .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) |