diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-12 11:00:24 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-12 11:00:24 +0000 |
| commit | c40273b09fd56d5bc18bfab46854171d648d620a (patch) | |
| tree | bd775ed4ca2eced6df1acbda9c0343a2f5716994 /lib/gitlab_shell.rb | |
| parent | 1cf14770f3bf5c3255f4c3a8f69ccfab74317fcd (diff) | |
| parent | cba67a745bb76eb368f6aa5884816677d7a40175 (diff) | |
| download | gitlab-shell-c40273b09fd56d5bc18bfab46854171d648d620a.tar.gz | |
Merge branch 'handle-gl-project' into 'master'
Handle GL_REPOSITORY env variable and use it in api calls
See merge request !130
Diffstat (limited to 'lib/gitlab_shell.rb')
| -rw-r--r-- | lib/gitlab_shell.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index f2e7465..355d493 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -13,7 +13,7 @@ class GitlabShell API_COMMANDS = %w(2fa_recovery_codes) GL_PROTOCOL = 'ssh'.freeze - attr_accessor :key_id, :repo_name, :command, :git_access + attr_accessor :key_id, :gl_repository, :repo_name, :command, :git_access attr_reader :repo_path def initialize(key_id) @@ -89,11 +89,12 @@ class GitlabShell end def verify_access - status = api.check_access(@git_access, @repo_name, @key_id, '_any', GL_PROTOCOL) + status = api.check_access(@git_access, nil, @repo_name, @key_id, '_any', GL_PROTOCOL) raise AccessDeniedError, status.message unless status.allowed? self.repo_path = status.repository_path + @gl_repository = status.gl_repository end def process_cmd(args) @@ -125,7 +126,8 @@ class GitlabShell 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'LANG' => ENV['LANG'], 'GL_ID' => @key_id, - 'GL_PROTOCOL' => GL_PROTOCOL + 'GL_PROTOCOL' => GL_PROTOCOL, + 'GL_REPOSITORY' => @gl_repository } if git_trace_available? |