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
Sep 01, 2017
by
Jacob Vosmaer (GitLab)
Committed by
Douwe Maan
Sep 01, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Gitaly PostUploadPack mandatory
parent
989bebbf
Changes
3
Hide 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
lib/gitlab/workhorse.rb
View file @
35acc4cb
...
@@ -35,10 +35,7 @@ module Gitlab
...
@@ -35,10 +35,7 @@ module Gitlab
when
'git_receive_pack'
when
'git_receive_pack'
Gitlab
::
GitalyClient
.
feature_enabled?
(
:post_receive_pack
)
Gitlab
::
GitalyClient
.
feature_enabled?
(
:post_receive_pack
)
when
'git_upload_pack'
when
'git_upload_pack'
Gitlab
::
GitalyClient
.
feature_enabled?
(
true
:post_upload_pack
,
status:
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
)
when
'info_refs'
when
'info_refs'
true
true
else
else
...
...
spec/lib/gitlab/workhorse_spec.rb
View file @
35acc4cb
...
@@ -228,21 +228,10 @@ describe Gitlab::Workhorse do
...
@@ -228,21 +228,10 @@ describe Gitlab::Workhorse do
let
(
:action
)
{
'git_upload_pack'
}
let
(
:action
)
{
'git_upload_pack'
}
let
(
:feature_flag
)
{
:post_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
it
'includes Gitaly params in the returned value'
do
allow
(
Gitlab
::
GitalyClient
).
to
receive
(
:feature_enabled?
).
with
(
feature_flag
).
and_return
(
true
)
allow
(
Gitlab
::
GitalyClient
).
to
receive
(
:feature_enabled?
).
with
(
feature_flag
).
and_return
(
true
)
expect
(
subject
).
to
include
(
gitaly_params
)
expect
(
subject
).
to
include
(
gitaly_params
)
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
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