diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-27 18:35:27 +0300 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-04-05 13:35:12 +0300 |
| commit | edcba1aa277c731ae2e375a571601d527c0ff6dc (patch) | |
| tree | 9b4c73d5c3c6938160a6929254ee407275e9b8a9 /app/controllers | |
| parent | b15dd5dfa2ac269763d6342d7f0b3d9a64eb7fe4 (diff) | |
Allow HTTP(s) when git request is made by GitLab CI
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 |