diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-09 14:12:56 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-09 14:12:56 +0000 |
| commit | 706b101f510b9a1f5acff51bb2f1b14c018b37ce (patch) | |
| tree | da359ce2b19e26d885e0742bcaf13e5d6d73fea6 /app/models/application_setting.rb | |
| parent | 80352b783ce359b70879bc7f2d571f219ae45bb1 (diff) | |
| parent | 9474e36f462522af1804e760e5fe134f101fce08 (diff) | |
| download | gitlab-ce-706b101f510b9a1f5acff51bb2f1b14c018b37ce.tar.gz | |
Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master'
Add option to include the sender name in body of Notify email
_Originally opened at !2495 by @huacnlee._
- - -
Fixes #7824.
See merge request !2767
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 9cafc78f761..44bbe5fb168 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -43,6 +43,7 @@ # metrics_port :integer default(8089) # sentry_enabled :boolean default(FALSE) # sentry_dsn :string +# email_author_in_body :boolean default(FALSE) # class ApplicationSetting < ActiveRecord::Base |