diff options
| author | Fu Xu <fuxu@fuxu.name> | 2016-09-02 16:57:08 +0800 |
|---|---|---|
| committer | Fu Xu <fuxu@fuxu.name> | 2016-10-03 18:07:28 +0800 |
| commit | 74c8e091f40c29a59b99bf7864b9fee303c68e50 (patch) | |
| tree | 48d65f3bad5d39656840526ef1720ee1e93335de /config/initializers | |
| parent | 7134599860651cc0f502581c97853a26f2fb4471 (diff) | |
| download | gitlab-ce-74c8e091f40c29a59b99bf7864b9fee303c68e50.tar.gz | |
add configurable email subject suffix
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 195108b921b..c5ed2162c92 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -186,6 +186,7 @@ Settings.gitlab['email_enabled'] ||= true if Settings.gitlab['email_enabled'].ni Settings.gitlab['email_from'] ||= ENV['GITLAB_EMAIL_FROM'] || "gitlab@#{Settings.gitlab.host}" Settings.gitlab['email_display_name'] ||= ENV['GITLAB_EMAIL_DISPLAY_NAME'] || 'GitLab' Settings.gitlab['email_reply_to'] ||= ENV['GITLAB_EMAIL_REPLY_TO'] || "noreply@#{Settings.gitlab.host}" +Settings.gitlab['email_subject_suffix'] ||= ENV['GITLAB_EMAIL_SUBJECT_SUFFIX'] || "" Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url) Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) Settings.gitlab['user'] ||= 'git' |