Merge pull request #1023 from SaitoWu/feature/https

Feature/https
This commit is contained in:
Dmitriy Zaporozhets 2012-07-02 01:52:23 -07:00
commit 15a03e1d87
4 changed files with 18 additions and 11 deletions

View file

@ -7,6 +7,11 @@ module Grack
user = User.find_by_email(email)
return false unless user.try(:valid_password?, password)
# Set GL_USER env variable
ENV['GL_USER'] = email
# Pass Gitolite update hook
ENV['GL_BYPASS_UPDATE_HOOK'] = "true"
# Need this patch because the rails mount
@env['PATH_INFO'] = @env['REQUEST_PATH']

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: '/:path', constraints: { path: /[\w-]+.git*/ }
}), at: '/:path', constraints: { path: /[\w-]+\.git/ }
#
# Help