diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-03-12 16:27:27 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-03-12 16:27:27 +0000 |
| commit | 60713c1fc6c6513246dd066b2e71d2bfd28c8e3a (patch) | |
| tree | 39fb93d45c253e6dfc0366f2d2802d49dfb67094 | |
| parent | 3754b406d4c2a587a54cc0ad5ccc23a60a2e641a (diff) | |
| parent | 91ebfcb6cc89531603c351f25ede5f197715bc82 (diff) | |
| download | gitlab-ce-60713c1fc6c6513246dd066b2e71d2bfd28c8e3a.tar.gz | |
Merge branch 'issue#50386' into 'master'
Remove fake repository_path response - resolved issue# 50386
Closes #50386
See merge request gitlab-org/gitlab-ce!25942
| -rw-r--r-- | changelogs/unreleased/25942-remove-fake-repository-path-response.yml | 5 | ||||
| -rw-r--r-- | lib/api/internal.rb | 5 | ||||
| -rw-r--r-- | spec/requests/api/internal_spec.rb | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/changelogs/unreleased/25942-remove-fake-repository-path-response.yml b/changelogs/unreleased/25942-remove-fake-repository-path-response.yml new file mode 100644 index 00000000000..e1da28ab03c --- /dev/null +++ b/changelogs/unreleased/25942-remove-fake-repository-path-response.yml @@ -0,0 +1,5 @@ +--- +title: Remove fake repository_path response +merge_request: 25942 +author: Fabio Papa +type: other diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 70b32f7d758..73fda55bac2 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -81,11 +81,6 @@ module API gl_id: Gitlab::GlId.gl_id(user), gl_username: user&.username, git_config_options: [], - - # This repository_path is a bogus value but gitlab-shell still requires - # its presence. https://gitlab.com/gitlab-org/gitlab-shell/issues/135 - repository_path: '/', - gitaly: gitaly_payload(params[:action]) } diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index de55390b258..b184c92824a 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -347,7 +347,6 @@ describe API::Internal do expect(response).to have_gitlab_http_status(200) expect(json_response["status"]).to be_truthy - expect(json_response["repository_path"]).to eq('/') expect(json_response["gl_project_path"]).to eq(project.wiki.full_path) expect(json_response["gl_repository"]).to eq("wiki-#{project.id}") expect(user.reload.last_activity_on).to be_nil @@ -360,7 +359,6 @@ describe API::Internal do expect(response).to have_gitlab_http_status(200) expect(json_response["status"]).to be_truthy - expect(json_response["repository_path"]).to eq('/') expect(json_response["gl_project_path"]).to eq(project.wiki.full_path) expect(json_response["gl_repository"]).to eq("wiki-#{project.id}") expect(user.reload.last_activity_on).to eql(Date.today) @@ -373,7 +371,6 @@ describe API::Internal do expect(response).to have_gitlab_http_status(200) expect(json_response["status"]).to be_truthy - expect(json_response["repository_path"]).to eq('/') expect(json_response["gl_repository"]).to eq("project-#{project.id}") expect(json_response["gl_project_path"]).to eq(project.full_path) expect(json_response["gitaly"]).not_to be_nil @@ -393,7 +390,6 @@ describe API::Internal do expect(response).to have_gitlab_http_status(200) expect(json_response["status"]).to be_truthy - expect(json_response["repository_path"]).to eq('/') expect(json_response["gl_repository"]).to eq("project-#{project.id}") expect(json_response["gl_project_path"]).to eq(project.full_path) expect(json_response["gitaly"]).not_to be_nil |