Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cf1a1e9a
Commit
cf1a1e9a
authored
Mar 21, 2018
by
Alejandro Rodríguez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Send Gitaly payload for git-upload-archive SSH commands
parent
22fc4863
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
GITLAB_SHELL_VERSION
GITLAB_SHELL_VERSION
+1
-1
lib/api/helpers/internal_helpers.rb
lib/api/helpers/internal_helpers.rb
+1
-1
spec/requests/api/internal_spec.rb
spec/requests/api/internal_spec.rb
+6
-0
No files found.
GITLAB_SHELL_VERSION
View file @
cf1a1e9a
6.0.4
7.1.0
lib/api/helpers/internal_helpers.rb
View file @
cf1a1e9a
...
...
@@ -109,7 +109,7 @@ module API
# Return the Gitaly Address if it is enabled
def
gitaly_payload
(
action
)
return
unless
%w[git-receive-pack git-upload-pack]
.
include?
(
action
)
return
unless
%w[git-receive-pack git-upload-pack
git-upload-archive
]
.
include?
(
action
)
{
repository:
repository
.
gitaly_repository
,
...
...
spec/requests/api/internal_spec.rb
View file @
cf1a1e9a
...
...
@@ -447,6 +447,12 @@ describe API::Internal do
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
json_response
[
"status"
]).
to
be_truthy
expect
(
json_response
[
"gitaly"
]).
not_to
be_nil
expect
(
json_response
[
"gitaly"
][
"repository"
]).
not_to
be_nil
expect
(
json_response
[
"gitaly"
][
"repository"
][
"storage_name"
]).
to
eq
(
project
.
repository
.
gitaly_repository
.
storage_name
)
expect
(
json_response
[
"gitaly"
][
"repository"
][
"relative_path"
]).
to
eq
(
project
.
repository
.
gitaly_repository
.
relative_path
)
expect
(
json_response
[
"gitaly"
][
"address"
]).
to
eq
(
Gitlab
::
GitalyClient
.
address
(
project
.
repository_storage
))
expect
(
json_response
[
"gitaly"
][
"token"
]).
to
eq
(
Gitlab
::
GitalyClient
.
token
(
project
.
repository_storage
))
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment