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

Email link https support

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-31 15:59:06 +03:00
parent 8ee0993fdf
commit 25924a9089
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/mailers/notify.rb
View file

@ -1,5 +1,7 @@
class Notify < ActionMailer::Base class Notify < ActionMailer::Base
default_url_options[:host] = EMAIL_OPTS["host"] default_url_options[:host] = EMAIL_OPTS["host"]
default_url_options[:protocol] = -> { EMAIL_OPTS["protocol"] ? EMAIL_OPTS["protocol"] : "http" }.call
default from: EMAIL_OPTS["from"] default from: EMAIL_OPTS["from"]
def new_user_email(user, password) def new_user_email(user, password)

4
config/gitlab.yml.example
View file

@ -6,6 +6,10 @@ email:
from: notify@gitlabhq.com from: notify@gitlabhq.com
host: gitlabhq.com host: gitlabhq.com
# Protocol used for links in email letters
# Value can be http or https
protocol: http # or https
# Git Hosting congiguration # Git Hosting congiguration
git_host: git_host:
system: gitolite system: gitolite