Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-workhorse
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-workhorse
Commits
8e83ac73
Commit
8e83ac73
authored
Sep 01, 2017
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make explicit that upload-pack is in Gitaly now
parent
b5f4a618
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
internal/git/git-http_test.go
internal/git/git-http_test.go
+5
-0
internal/git/upload-pack.go
internal/git/upload-pack.go
+2
-1
No files found.
internal/git/git-http_test.go
View file @
8e83ac73
...
...
@@ -40,6 +40,11 @@ func TestHandleReceivePack(t *testing.T) {
}
func
testHandlePostRpc
(
t
*
testing
.
T
,
action
string
,
handler
func
(
*
GitHttpResponseWriter
,
*
http
.
Request
,
*
api
.
Response
)
error
)
{
defer
func
(
oldTesting
bool
)
{
Testing
=
oldTesting
}(
Testing
)
Testing
=
true
execCommand
=
fakeExecCommand
defer
func
()
{
execCommand
=
exec
.
Command
}()
...
...
internal/git/upload-pack.go
View file @
8e83ac73
...
...
@@ -28,7 +28,8 @@ func handleUploadPack(w *GitHttpResponseWriter, r *http.Request, a *api.Response
action
:=
getService
(
r
)
writePostRPCHeader
(
w
,
action
)
if
a
.
GitalyServer
.
Address
==
""
{
if
Testing
&&
a
.
GitalyServer
.
Address
==
""
{
// This code path is no longer reachable in GitLab 10.0
err
=
handleUploadPackLocally
(
a
,
r
,
buffer
,
w
,
action
)
}
else
{
err
=
handleUploadPackWithGitaly
(
r
.
Context
(),
a
,
buffer
,
w
)
...
...
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