diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-01 14:21:45 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-01 14:21:45 +0000 |
commit | 2ef16e76609e04a398a88c9704abf41795e452de (patch) | |
tree | 29529391602a163be80acf6706e9abb2aaef1791 /config | |
parent | 26be65337cce7ba5d6421e252397ec3c09c32fa0 (diff) | |
parent | 780bac1026f96d68d8c658ead605c61a5b018f62 (diff) | |
download | gitlab-ce-2ef16e76609e04a398a88c9704abf41795e452de.tar.gz |
Merge branch 'gitlab-git-http-server' into 'master'
Replace grack with gitlab-git-http-server
See merge request !1229
Diffstat (limited to 'config')
-rw-r--r-- | config/routes.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/config/routes.rb b/config/routes.rb index 8ba439f08b8..920ece518ea 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,12 +30,7 @@ Gitlab::Application.routes.draw do end # Enable Grack support - mount Grack::Bundle.new({ - git_path: Gitlab.config.git.bin_path, - project_root: Gitlab.config.gitlab_shell.repos_path, - upload_pack: Gitlab.config.gitlab_shell.upload_pack, - receive_pack: Gitlab.config.gitlab_shell.receive_pack - }), at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post] + mount Grack::Auth.new({}), at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post] # Help get 'help' => 'help#index' |