Commit 21e55ca3 authored by Chris Frohoff's avatar Chris Frohoff

added RAILS_RELATIVE_URL_ROOT support

parent e9394c48
8-5-nxd 8-1-stable 8-2-nxd 8-2-stable 8-4-nxd 8-4-stable 8-5-stable 8-6-nxd 8-6-stable 8-7-nxd 8-8-nxd master q/check-exit-code x y/archive.xz v8.11.0.pre v8.10.3 v8.10.2 v8.10.1 v8.10.0 v8.10.0.pre v8.10.0-rc13 v8.10.0-rc12 v8.10.0-rc11 v8.10.0-rc10 v8.10.0-rc9 v8.10.0-rc8 v8.10.0-rc7 v8.10.0-rc6 v8.10.0-rc5 v8.10.0-rc4 v8.10.0-rc3 v8.10.0-rc2 v8.10.0-rc1 v8.9.6 v8.9.5 v8.9.4 v8.9.3 v8.9.2 v8.9.1 v8.9.0 v8.9.0-rc8 v8.9.0-rc7 v8.9.0-rc6 v8.9.0-rc5 v8.9.0-rc4 v8.9.0-rc3 v8.9.0-rc2 v8.9.0-rc1 v8.8.7 v8.8.6 v8.8.5 v8.8.4 v8.8.3 v8.8.2 v8.8.1 v8.8.0 v8.8.0-rc2 v8.8.0-rc1 v8.7.9 v8.7.8 v8.7.7 v8.7.6 v8.7.5 v8.7.4 v8.7.3 v8.7.2 v8.7.1 v8.7.0 v8.7.0-rc7 v8.7.0-rc6 v8.7.0-rc5 v8.7.0-rc4 v8.7.0-rc3 v8.7.0-rc2 v8.7.0-rc1 v8.6.9 v8.6.8 v8.6.7 v8.6.6 v8.6.5 v8.6.4 v8.6.3 v8.6.2 v8.6.1 v8.6.0 v8.6.0-rc5 v8.6.0-rc4 v8.6.0-rc3 v8.6.0-rc2 v8.6.0-rc1 v8.5.13 v8.5.12 v8.5.11 v8.5.10 v8.5.9 v8.5.8 v8.5.7 v8.5.6 v8.5.5 v8.5.5-rc1 v8.5.4 v8.5.3 v8.5.2 v8.5.1 v8.5.1.TR v8.5.1.RD2 v8.5.1.RD1 v8.5.1.DB2 v8.5.1.DB v8.5.0 v8.5.0-rc4 v8.5.0-rc3 v8.5.0-rc2 v8.5.0-rc1 v8.4.11 v8.4.10 v8.4.9 v8.4.8 v8.4.7 v8.4.6 v8.4.5 v8.4.4 v8.4.3 v8.4.2 v8.4.1 v8.4.0 v8.4.0.rc1 v8.4.0-rc3 v8.4.0-rc2 v8.3.10 v8.3.9 v8.3.8 v8.3.7 v8.3.6 v8.3.5 v8.3.4 v8.3.3 v8.3.2 v8.3.1 v8.3.0 v8.3.0.rc3 v8.3.0.rc2 v8.3.0.rc1 v8.2.6 v8.2.5 v8.2.4 v8.2.3 v8.2.2 v8.2.1 v8.2.0 v8.2.0.rc2 v8.2.0.rc1 v8.1.4 v8.1.3 v8.1.2 v8.1.1 v8.1.0 v8.1.0.rc2 v8.1.0.rc1 v8.0.5 v8.0.4 v8.0.3 v8.0.2 v8.0.1 v8.0.0 v8.0.0.rc4 v8.0.0.rc3 v8.0.0.rc2 v8.0.0.rc1 v7.14.3 v7.14.2 v7.14.1 v7.14.0 v7.14.0.rc3 v7.14.0.rc2 v7.14.0.rc1 v7.13.5 v7.13.4 v7.13.3 v7.13.2 v7.13.1 v7.13.0 v7.13.0.rc4 v7.13.0.rc3 v7.13.0.rc2 v7.13.0.rc1 v7.12.2 v7.12.1 v7.12.0 v7.12.0.rc3 v7.12.0.rc2 v7.12.0.rc1 v7.11.4 v7.11.3 v7.11.2 v7.11.1 v7.11.0 v7.11.0.rc2 v7.11.0.rc1 v7.10.5 v7.10.4 v7.10.3 v7.10.2 v7.10.1 v7.10.0 v7.10.0.rc8 v7.10.0.rc7 v7.10.0.rc6 v7.10.0.rc5 v7.10.0.rc4 v7.10.0.rc3 v7.10.0.rc2 v7.10.0.rc1 v7.9.4 v7.9.3 v7.9.2 v7.9.1 v7.9.0 v7.9.0.rc3 v7.9.0.rc2 v7.9.0.rc1 v7.8.4 v7.8.3 v7.8.2 v7.8.1 v7.8.0 v7.8.0.rc6 v7.8.0.rc5 v7.8.0.rc4 v7.8.0.rc3 v7.8.0.rc2 v7.8.0.rc1 v7.7.2 v7.7.1 v7.7.0 v7.7.0.rc4 v7.7.0.rc3 v7.7.0.rc2 v7.7.0.rc1 v7.6.2 v7.6.1 v7.6.1-rtl v7.6.0 v7.6.0.rc1 v7.5.3 v7.5.2 v7.5.1 v7.5.0 v7.5.0.rc1 v7.4.5 v7.4.4 v7.4.3 v7.4.2 v7.4.1 v7.4.0 v7.4.0.rc1 v7.3.3 v7.3.2 v7.3.1 v7.3.0 v7.3.0.rc1 v7.2.3 v7.2.2 v7.2.1 v7.2.0 v7.2.0.rc5 v7.2.0.rc4 v7.2.0.rc3 v7.2.0.rc2 v7.2.0.rc1 v7.1.1 v7.1.0 v7.1.0.rc1 v7.0.0 v7.0.0.rc1 v6.9.2 v6.9.1 v6.9.0 v6.9.0.rc1 v6.8.2 v6.8.1 v6.8.0 v6.8.0.rc1 v6.7.5 v6.7.4 v6.7.3 v6.7.2 v6.7.1 v6.7.0 v6.7.0.rc1 v6.6.5 v6.6.4 v6.6.3 v6.6.2 v6.6.1 v6.6.0 v6.6.0.rc1 v6.6.0.pre1 v6.5.1 v6.5.0 v6.5.0.rc1 v6.4.3 v6.4.2 v6.4.1 v6.4.0 v6.4.0.pre3 v6.4.0.pre2 v6.4.0.pre1 v6.3.1 v6.3.0 v6.2.4 v6.2.3 v6.2.2 v6.2.1 v6.2.0 v6.1.0 v6.0.2 v6.0.1 v6.0.0 v5.4.2 v5.4.1 v5.4.0 v5.3.0 v5.2.1 v5.2.0 v5.1.0 v5.0.1 v5.0.0 v4.2.0 v4.1.0 test-fix show rtl-7.6.1 rtl-7.5.1 rtl-7.4.2.1 rtl-7.4.2 fondev TR.8.4.4
No related merge requests found
......@@ -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
......
# This file is used by Rack-based servers to start the application.
require ::File.expand_path('../config/environment', __FILE__)
run Gitlab::Application
map ENV['RAILS_RELATIVE_URL_ROOT'] || "/" do
run Gitlab::Application
end
......@@ -18,6 +18,9 @@ gitlab:
host: localhost
port: 80
https: false
# uncomment and customize to run in non-root path
# note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/unicorn.rb may need to be changed
# relative_url_root: /gitlab
## Email settings
# Email address used in the "From" field in mails sent by GitLab
......
......@@ -25,7 +25,8 @@ class Settings < Settingslogic
[ gitlab.protocol,
"://",
gitlab.host,
custom_port
custom_port,
gitlab.relative_url_root
].join('')
end
end
......@@ -45,6 +46,7 @@ Settings.gitlab['default_projects_limit'] ||= 10
Settings.gitlab['host'] ||= 'localhost'
Settings.gitlab['https'] ||= false
Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
Settings.gitlab['relative_url_root'] ||= ''
Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
......
......@@ -18,7 +18,7 @@ Gitlab::Application.routes.draw do
project_root: Gitlab.config.gitolite.repos_path,
upload_pack: Gitlab.config.gitolite.upload_pack,
receive_pack: Gitlab.config.gitolite.receive_pack
}), at: '/:path', constraints: { path: /[-\/\w\.-]+\.git/ }
}), at: '/', constraints: lambda { |request| /[-\/\w\.-]+\.git/.match(request.path_info) }
#
# Help
......
# uncomment and customize to run in non-root path
# note that config/gitlab.yml web path should also be changed
# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
app_dir = "/home/gitlab/gitlab/"
worker_processes 2
working_directory app_dir
......
......@@ -17,10 +17,6 @@ module Grack
# Pass Gitolite update hook
ENV['GL_BYPASS_UPDATE_HOOK'] = "true"
# Need this patch due to the rails mount
@env['PATH_INFO'] = @request.path
@env['SCRIPT_NAME'] = ""
# Find project by PATH_INFO from env
if m = /^\/([\w\.\/-]+)\.git/.match(@request.path_info).to_a
self.project = Project.find_with_namespace(m.last)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment