summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorJason Lee <huacnlee@gmail.com>2016-01-26 21:34:42 +0800
committerRémy Coutable <remy@rymai.me>2016-02-09 12:58:13 +0100
commit9474e36f462522af1804e760e5fe134f101fce08 (patch)
treeb58b50cbd00970d1bc8320850f9a4d3eb38516e9 /app/controllers/admin
parent2837f5c179ebef57de4cbaa7587173d35a4cb397 (diff)
downloadgitlab-ce-9474e36f462522af1804e760e5fe134f101fce08.tar.gz
Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/application_settings_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 1515086b16d..04a99d8c84a 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -81,6 +81,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:sentry_dsn,
:akismet_enabled,
:akismet_api_key,
+ :email_author_in_body,
restricted_visibility_levels: [],
import_sources: []
)