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

Merge pull request #1827 from mgrobelin/master

Browse source 
grack auth bugfix: allow dots in reponame
This commit is contained in:
Saito 2012-10-26 06:35:37 -07:00
parent 643ed9cbf3 bd50a9f466
commit 4f687aaa8e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/routes.rb
View file

@ -18,7 +18,7 @@ Gitlab::Application.routes.draw do
project_root: Gitlab.config.git_base_path,
upload_pack: Gitlab.config.git_upload_pack,
receive_pack: Gitlab.config.git_receive_pack
}), at: '/:path', constraints: { path: /[\w-]+\.git/ }
}), at: '/:path', constraints: { path: /[\w\.-]+\.git/ }
#
# Help

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