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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
35acc4cb
Commit
35acc4cb
authored
7 years ago
by
Jacob Vosmaer (GitLab)
Committed by
Douwe Maan
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Gitaly PostUploadPack mandatory
parent
989bebbf
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
18 deletions
+9
-18
changelogs/unreleased/gitaly-post-upload-pack-mandatory.yml
changelogs/unreleased/gitaly-post-upload-pack-mandatory.yml
+5
-0
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+1
-4
spec/lib/gitlab/workhorse_spec.rb
spec/lib/gitlab/workhorse_spec.rb
+3
-14
No files found.
changelogs/unreleased/gitaly-post-upload-pack-mandatory.yml
0 → 100644
View file @
35acc4cb
---
title
:
Make Gitaly PostUploadPack mandatory
merge_request
:
13953
author
:
type
:
changed
This diff is collapsed.
Click to expand it.
lib/gitlab/workhorse.rb
View file @
35acc4cb
...
...
@@ -35,10 +35,7 @@ module Gitlab
when
'git_receive_pack'
Gitlab
::
GitalyClient
.
feature_enabled?
(
:post_receive_pack
)
when
'git_upload_pack'
Gitlab
::
GitalyClient
.
feature_enabled?
(
:post_upload_pack
,
status:
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
)
true
when
'info_refs'
true
else
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/workhorse_spec.rb
View file @
35acc4cb
...
...
@@ -228,7 +228,6 @@ describe Gitlab::Workhorse do
let
(
:action
)
{
'git_upload_pack'
}
let
(
:feature_flag
)
{
:post_upload_pack
}
context
'when action is enabled by feature flag'
do
it
'includes Gitaly params in the returned value'
do
allow
(
Gitlab
::
GitalyClient
).
to
receive
(
:feature_enabled?
).
with
(
feature_flag
).
and_return
(
true
)
...
...
@@ -236,16 +235,6 @@ describe Gitlab::Workhorse do
end
end
context
'when action is not enabled by feature flag'
do
it
'does not include Gitaly params in the returned value'
do
status_opt_out
=
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
allow
(
Gitlab
::
GitalyClient
).
to
receive
(
:feature_enabled?
).
with
(
feature_flag
,
status:
status_opt_out
).
and_return
(
false
)
expect
(
subject
).
not_to
include
(
gitaly_params
)
end
end
end
context
"when git_receive_pack action is passed"
do
let
(
:action
)
{
'git_receive_pack'
}
...
...
This diff is collapsed.
Click to expand it.
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