From 2d212e401e099543f7612e67ff35b4e8b10593c0 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Thu, 16 Aug 2018 13:00:24 +0200 Subject: Remove repo_path from GitlabShell 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 --- lib/gitlab_access_status.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/gitlab_access_status.rb') 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 -- cgit v1.2.1