summaryrefslogtreecommitdiff
path: root/doc/administration/index.md
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2018-04-04 12:11:55 -0500
committerEric Eastwood <contact@ericeastwood.com>2018-04-04 12:29:03 -0500
commita6c7d8050eb6eeb0373f69a3f99c7f7b64f77e07 (patch)
treef652425e0aaf3c20d2788e21683492528fd5bb58 /doc/administration/index.md
parent1be9f587351639a359416e915a25faf7280b65e9 (diff)
downloadgitlab-ce-a6c7d8050eb6eeb0373f69a3f99c7f7b64f77e07.tar.gz
Add custom additonal email text to all emailsce-4474-custom-additional-text-in-confirmation-email
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474 Conflicts: db/schema.rb ee/app/controllers/ee/admin/application_settings_controller.rb ee/app/helpers/ee/application_settings_helper.rb ee/app/models/ee/application_setting.rb ee/app/models/license.rb ee/app/views/layouts/service_desk.html.haml ee/app/views/notify/approved_merge_request_email.html.haml ee/app/views/notify/service_desk_new_note_email.text.erb ee/app/views/notify/service_desk_thank_you_email.text.erb ee/app/views/notify/unapproved_merge_request_email.html.haml ee/lib/ee/api/entities.rb ee/spec/controllers/admin/application_settings_controller_spec.rb ee/spec/models/application_setting_spec.rb ee/spec/requests/api/settings_spec.rb lib/api/settings.rb spec/mailers/previews/notify_preview.rb
Diffstat (limited to 'doc/administration/index.md')
-rw-r--r--doc/administration/index.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md
index 60a45426636..c8f27719ce9 100644
--- a/doc/administration/index.md
+++ b/doc/administration/index.md
@@ -85,7 +85,6 @@ created in snippets, wikis, and repos.
- [Postfix for incoming email](reply_by_email_postfix_setup.md): Set up a
basic Postfix mail server with IMAP authentication on Ubuntu for incoming
emails.
-server with IMAP authentication on Ubuntu, to be used with Reply by email.
- [User Cohorts](../user/admin_area/user_cohorts.md): Display the monthly cohorts of new users and their activities over time.
[reply by email]: reply_by_email.md