diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-05 18:34:00 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-05 18:34:00 +0000 |
| commit | 1367e4ff9fbcdbf8eaa376183d1a2ffca7041641 (patch) | |
| tree | 1d0e1c8de45d27558fadda09ad8509b5cdcb0571 /app/controllers | |
| parent | 160b4827edad1984ddb4339622b93ace17870cb1 (diff) | |
| parent | 9750006b1a7e78785256cf669c336c0075584d3b (diff) | |
| download | gitlab-ce-1367e4ff9fbcdbf8eaa376183d1a2ffca7041641.tar.gz | |
Merge branch '44389-always-allow-http-for-ci-git-operations' into 'master'
Resolve "Allow HTTPS cloning by Runners if it is disabled for users"
Closes #44389
See merge request gitlab-org/gitlab-ce!18021
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/git_http_client_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/git_http_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/git_http_client_controller.rb b/app/controllers/projects/git_http_client_controller.rb index dd5e66f60e3..07249fe3182 100644 --- a/app/controllers/projects/git_http_client_controller.rb +++ b/app/controllers/projects/git_http_client_controller.rb @@ -7,6 +7,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController attr_reader :authentication_result, :redirected_path delegate :actor, :authentication_abilities, to: :authentication_result, allow_nil: true + delegate :type, to: :authentication_result, allow_nil: true, prefix: :auth_result alias_method :user, :actor alias_method :authenticated_user, :actor 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 |