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
a78306e7
Commit
a78306e7
authored
Jul 25, 2017
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable gitaly_post_upload_pack by default
parent
c2c8d7ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
changelogs/unreleased/post-upload-pack-opt-out.yml
changelogs/unreleased/post-upload-pack-opt-out.yml
+4
-0
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+4
-1
spec/lib/gitlab/workhorse_spec.rb
spec/lib/gitlab/workhorse_spec.rb
+2
-1
No files found.
changelogs/unreleased/post-upload-pack-opt-out.yml
0 → 100644
View file @
a78306e7
---
title
:
Enable gitaly_post_upload_pack by default
merge_request
:
13078
author
:
lib/gitlab/workhorse.rb
View file @
a78306e7
...
@@ -35,7 +35,10 @@ module Gitlab
...
@@ -35,7 +35,10 @@ 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?
(
:post_upload_pack
)
Gitlab
::
GitalyClient
.
feature_enabled?
(
: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 @
a78306e7
...
@@ -237,7 +237,8 @@ describe Gitlab::Workhorse, lib: true do
...
@@ -237,7 +237,8 @@ describe Gitlab::Workhorse, lib: true do
context
'when action is not enabled by feature flag'
do
context
'when action is not enabled by feature flag'
do
it
'does not include Gitaly params in the returned value'
do
it
'does not include Gitaly params in the returned value'
do
allow
(
Gitlab
::
GitalyClient
).
to
receive
(
:feature_enabled?
).
with
(
feature_flag
).
and_return
(
false
)
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
)
expect
(
subject
).
not_to
include
(
gitaly_params
)
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