diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-02 01:52:23 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-02 01:52:23 -0700 |
| commit | 15a03e1d871c9d74508af74abd6705a1c27bb6c7 (patch) | |
| tree | aec473f89285f5b2dc97ad8ddffc3680f349db3f /config | |
| parent | f464d4c9f0254014ef4c982369d0499eff5f90a6 (diff) | |
| parent | 401340168c4596a872fd5d94ec9d52b33886f45f (diff) | |
| download | gitlab-ce-15a03e1d871c9d74508af74abd6705a1c27bb6c7.tar.gz | |
Merge pull request #1023 from SaitoWu/feature/https
Feature/https
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/grack_auth.rb | 5 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config/initializers/grack_auth.rb b/config/initializers/grack_auth.rb index b44a01f4a0c..5995b873de9 100644 --- a/config/initializers/grack_auth.rb +++ b/config/initializers/grack_auth.rb @@ -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'] diff --git a/config/routes.rb b/config/routes.rb index cbec66ec1e2..b87009b1fce 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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 |