summaryrefslogtreecommitdiff
path: root/app/helpers/application_settings_helper.rb
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2018-11-07 11:00:21 +0000
committerTiago Botelho <tiagonbotelho@hotmail.com>2018-11-07 12:24:14 +0000
commitc239452b47f2819e3ed2fdaf4679737b3e1a456e (patch)
treebfaee22cd6c0f180faa2a9f83a97375efd804fff /app/helpers/application_settings_helper.rb
parentc81d4a65a255146619ccf52ece16757c7db622ae (diff)
downloadgitlab-ce-c239452b47f2819e3ed2fdaf4679737b3e1a456e.tar.gz
User can keep their commit email private43521-keep-personal-emails-private
The private commit email is automatically generated in the format: id-username@noreply.HOSTNAME GitLab instance admins are able to change the HOSTNAME portion, that defaults to Gitlab's hostname, to whatever they prefer.
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
-rw-r--r--app/helpers/application_settings_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 9a1c2a4c9e1..086bb38ce9a 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -217,7 +217,8 @@ module ApplicationSettingsHelper
:user_oauth_applications,
:version_check_enabled,
:web_ide_clientside_preview_enabled,
- :diff_max_patch_bytes
+ :diff_max_patch_bytes,
+ :commit_email_hostname
]
end