deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Epic: Gitlab configuration with default values

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-07-02 21:51:48 +03:00
parent b3a0ee8e63
commit 9b337b8328
25 changed files with 147 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/mailers/notify.rb
View file

@ -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)