diff options
| author | Hannes Rosenögger <123haynes@gmail.com> | 2015-03-11 05:41:58 +0000 |
|---|---|---|
| committer | Hannes Rosenögger <123haynes@gmail.com> | 2015-03-11 05:41:58 +0000 |
| commit | 94affe6d51f14b9a881a5e1d06c6c7e5d734f5bc (patch) | |
| tree | ce3fa32561ed369c6536d61bf0bef238d8d6f751 /app/mailers | |
| parent | c572bdb587bada094af867839a60a26a1fc1423e (diff) | |
| parent | 61ed518781cfc78bf1710286d84d4e74521f48d4 (diff) | |
| download | gitlab-ce-94affe6d51f14b9a881a5e1d06c6c7e5d734f5bc.tar.gz | |
Merge branch 'master' into 'master'
Make email display name configurable
#216
See merge request !80
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/notify.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 65925b61e94..ee27879cf40 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -53,7 +53,7 @@ class Notify < ActionMailer::Base # The default email address to send emails from def default_sender_address address = Mail::Address.new(Gitlab.config.gitlab.email_from) - address.display_name = "GitLab" + address.display_name = Gitlab.config.gitlab.email_display_name address end |