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

Merge remote-tracking branch 'gitlabhq/master' into git_commit_fix

Browse source 
Conflicts:
	doc/install/installation.md
This commit is contained in:
David Barri 2012-11-11 21:27:55 +11:00
commit 93f0a8c9b3
369 changed files with 102667 additions and 1369 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/gitlab/backend/gitolite_config.rb
View file

@ -14,7 +14,10 @@ module Gitlab
end
def ga_repo
@ga_repo ||= ::Gitolite::GitoliteAdmin.new(File.join(config_tmp_dir,'gitolite'))
@ga_repo ||= ::Gitolite::GitoliteAdmin.new(
File.join(config_tmp_dir,'gitolite'),
conf: Gitlab.config.gitolite_config_file
)
end
def apply

4
lib/gitlab/backend/grack_auth.rb
View file

@ -18,7 +18,7 @@ module Grack
@env['SCRIPT_NAME'] = ""
# Find project by PATH_INFO from env
if m = /^\/([\w-]+).git/.match(@request.path_info).to_a
if m = /^\/([\w\.-]+)\.git/.match(@request.path_info).to_a
self.project = Project.find_by_path(m.last)
return false unless project
end
@ -65,7 +65,7 @@ module Grack
end
# Need to reset seek point
@request.body.rewind
/refs\/heads\/([\w-]+)/.match(input).to_a.first
/refs\/heads\/([\w\.-]+)/.match(input).to_a.first
end
protected