summaryrefslogtreecommitdiff
path: root/lib/gitlab_access_status.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-08-16 13:00:24 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-08-16 15:06:03 +0200
commit2d212e401e099543f7612e67ff35b4e8b10593c0 (patch)
treec8d38ce1c033d3ad5acf4407a1447f3b95eb6cf2 /lib/gitlab_access_status.rb
parentfb8606f65a60808e52539f71f09fba871b5aba6b (diff)
downloadgitlab-shell-zj-remove-repo-path.tar.gz
Remove repo_path from GitlabShellzj-remove-repo-path
The internal api returns '/' from gitlab, since `8fad07383ada021fc995294fd0fe0f77fe37da35` from GitLab CE. To clean up later, https://gitlab.com/gitlab-org/gitlab-shell/issues/135 was created. This change closes that issue, making it possible to remove the field from the response on GitLab-CE too. Given the Rails app always returns `/` as the repository_path, the associated checks are basically a noop too. The tests are updated and at times look a little fishy, but those are testing code that is to be removed in another MR. Closes https://gitlab.com/gitlab-org/gitlab-shell/issues/135
Diffstat (limited to 'lib/gitlab_access_status.rb')
-rw-r--r--lib/gitlab_access_status.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab_access_status.rb b/lib/gitlab_access_status.rb
index afb5a9e..96dd6e8 100644
--- a/lib/gitlab_access_status.rb
+++ b/lib/gitlab_access_status.rb
@@ -3,14 +3,13 @@ require 'json'
class GitAccessStatus
attr_reader :message, :gl_repository, :gl_id, :gl_username, :repository_path, :gitaly, :git_protocol, :git_config_options
- def initialize(status, message, gl_repository:, gl_id:, gl_username:, repository_path:, gitaly:, git_protocol:, git_config_options:)
+ def initialize(status, message, gl_repository:, gl_id:, gl_username:, gitaly:, git_protocol:, git_config_options:)
@status = status
@message = message
@gl_repository = gl_repository
@gl_id = gl_id
@gl_username = gl_username
@git_config_options = git_config_options
- @repository_path = repository_path
@gitaly = gitaly
@git_protocol = git_protocol
end
@@ -23,7 +22,6 @@ class GitAccessStatus
gl_id: values["gl_id"],
gl_username: values["gl_username"],
git_config_options: values["git_config_options"],
- repository_path: values["repository_path"],
gitaly: values["gitaly"],
git_protocol: values["git_protocol"])
end