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

Merge pull request #1020 from SaitoWu/feature/https

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

5
config/initializers/grack_auth.rb
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