diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-02 19:29:15 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-02 19:29:15 +0000 |
| commit | caf5b9e5fa562cee2cca9cb484927a190b2bcf8a (patch) | |
| tree | 84ba2564b6ba27dbb6c6649cf142c2848059582f /app/mailers/notify.rb | |
| parent | b3a0ee8e631c3e272c8ce3b60929192d3f7f1f22 (diff) | |
| parent | 1d543e64300666e2abc5cc8562e6b55458878801 (diff) | |
| download | gitlab-ce-caf5b9e5fa562cee2cca9cb484927a190b2bcf8a.tar.gz | |
Merge branch 'feature/config' of dev.gitlabhq.com:gitlabhq
Diffstat (limited to 'app/mailers/notify.rb')
| -rw-r--r-- | app/mailers/notify.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 05fd17b511a..37b442bce71 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -2,10 +2,10 @@ class Notify < ActionMailer::Base include Resque::Mailer add_template_helper ApplicationHelper - default_url_options[:host] = EMAIL_OPTS["host"] - default_url_options[:protocol] = -> { EMAIL_OPTS["protocol"] ? EMAIL_OPTS["protocol"] : "http" }.call + default_url_options[:host] = Gitlab.config.web_host + default_url_options[:protocol] = Gitlab.config.web_protocol - default from: EMAIL_OPTS["from"] + default from: Gitlab.config.email_from def new_user_email(user_id, password) @user = User.find(user_id) |