Merge pull request #1020 from SaitoWu/feature/https

Feature/https
This commit is contained in:
Dmitriy Zaporozhets 2012-06-29 06:44:45 -07:00
commit fca957086e
2 changed files with 5 additions and 2 deletions

View File

@ -5,7 +5,10 @@ module Grack
# Authentication with username and password
email, password = @auth.credentials
user = User.find_by_email(email)
return false unless user.valid_password?(password)
return false unless user.try(:valid_password?, password)
# Need this patch because the rails mount
@env['PATH_INFO'] = @env['REQUEST_PATH']
# Find project by PATH_INFO from env
if m = /^\/([\w-]+).git/.match(@env['PATH_INFO']).to_a

View File

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