diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-04-11 00:55:02 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-04-11 00:55:02 +0100 |
| commit | 3f73bdd837f9803b75eca484a0a0615db6c58c80 (patch) | |
| tree | 0bd2c99d9198bfa22e7a29f375131f940033da7b /app/controllers/projects/git_http_controller.rb | |
| parent | b594ab949d1a2ceb9d949ff2641679fbdf273452 (diff) | |
| parent | 37a5632483b67ddcfa4c535cc911319b25f01fb5 (diff) | |
| download | gitlab-ce-xterm-npm.tar.gz | |
Merge branch 'master' into xterm-npmxterm-npm
Diffstat (limited to 'app/controllers/projects/git_http_controller.rb')
| -rw-r--r-- | app/controllers/projects/git_http_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb index 45910a9be44..1dcf837f78e 100644 --- a/app/controllers/projects/git_http_controller.rb +++ b/app/controllers/projects/git_http_controller.rb @@ -64,7 +64,7 @@ class Projects::GitHttpController < Projects::GitHttpClientController @access ||= access_klass.new(access_actor, project, 'http', authentication_abilities: authentication_abilities, namespace_path: params[:namespace_id], project_path: project_path, - redirected_path: redirected_path) + redirected_path: redirected_path, auth_result_type: auth_result_type) end def access_actor |