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

Merge pull request #2162 from frohoff/config-improvements

Browse source 
support for running in non-root directory/path (RAILS_RELATIVE_URL_ROOT)
This commit is contained in:
Saito 2012-12-29 12:19:07 -08:00
commit 151ada7645
7 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/mailers/notify.rb
View file

@ -6,6 +6,7 @@ class Notify < ActionMailer::Base
default_url_options[:host] = Gitlab.config.gitlab.host
default_url_options[:protocol] = Gitlab.config.gitlab.protocol
default_url_options[:port] = Gitlab.config.gitlab.port if Gitlab.config.gitlab_on_non_standard_port?
default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root
default from: Gitlab.config.gitlab.email_from