kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases 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
Show stats 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 # Authentication with username and password
email, password = @auth.credentials email, password = @auth.credentials
user = User.find_by_email(email) 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 # Find project by PATH_INFO from env
if m = /^\/([\w-]+).git/.match(@env['PATH_INFO']).to_a if m = /^\/([\w-]+).git/.match(@env['PATH_INFO']).to_a

2
config/routes.rb
View file

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