From 9b337b8328a65c5e692c90ba1f817184bd054257 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 2 Jul 2012 21:51:48 +0300
Subject: Epic: Gitlab configuration with default values

---
 app/mailers/notify.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/mailers')

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)
-- 
cgit v1.2.1