diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab_access_status.rb | 7 | ||||
-rw-r--r-- | lib/gitlab_shell.rb | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/gitlab_access_status.rb b/lib/gitlab_access_status.rb index dd6562e..dc577f4 100644 --- a/lib/gitlab_access_status.rb +++ b/lib/gitlab_access_status.rb @@ -3,15 +3,17 @@ require 'json' class GitAccessStatus HTTP_MULTIPLE_CHOICES = '300'.freeze - attr_reader :message, :gl_repository, :gl_id, :gl_username, :gitaly, :git_protocol, :git_config_options, :payload + attr_reader :message, :gl_repository, :gl_project_path, :gl_id, :gl_username, :gitaly, :git_protocol, :git_config_options, :payload - def initialize(status, status_code, message, gl_repository: nil, gl_id: nil, + def initialize(status, status_code, message, gl_repository: nil, + gl_project_path: nil, gl_id: nil, gl_username: nil, gitaly: nil, git_protocol: nil, git_config_options: nil, payload: nil) @status = status @status_code = status_code @message = message @gl_repository = gl_repository + @gl_project_path = gl_project_path @gl_id = gl_id @gl_username = gl_username @git_config_options = git_config_options @@ -26,6 +28,7 @@ class GitAccessStatus status_code, values["message"], gl_repository: values["gl_repository"], + gl_project_path: values["gl_project_path"], gl_id: values["gl_id"], gl_username: values["gl_username"], git_config_options: values["git_config_options"], diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index c1bb976..2cb76a8 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -27,7 +27,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength TWO_FACTOR_RECOVERY_COMMAND = '2fa_recovery_codes' GL_PROTOCOL = 'ssh' - attr_accessor :gl_id, :gl_repository, :repo_name, :command, :git_access, :git_protocol + attr_accessor :gl_id, :gl_repository, :gl_project_path, :repo_name, :command, :git_access, :git_protocol def initialize(who) who_sym, = GitlabNet.parse_who(who) @@ -58,6 +58,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength @gl_repository = access_status.gl_repository @git_protocol = ENV['GIT_PROTOCOL'] + @gl_project_path = access_status.gl_project_path @gitaly = access_status.gitaly @username = access_status.gl_username @git_config_options = access_status.git_config_options @@ -167,6 +168,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength args = JSON.dump( 'repository' => @gitaly['repository'], 'gl_repository' => @gl_repository, + 'gl_project_path' => @gl_project_path, 'gl_id' => @gl_id, 'gl_username' => @username, 'git_config_options' => @git_config_options, |