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
13007368
Commit
13007368
authored
Jul 24, 2017
by
Ahmad Sherif
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a unique feature name for Workhorse send blob migration
parent
b92d5135
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+1
-1
spec/lib/gitlab/workhorse_spec.rb
spec/lib/gitlab/workhorse_spec.rb
+2
-2
No files found.
lib/gitlab/workhorse.rb
View file @
13007368
...
@@ -62,7 +62,7 @@ module Gitlab
...
@@ -62,7 +62,7 @@ module Gitlab
end
end
def
send_git_blob
(
repository
,
blob
)
def
send_git_blob
(
repository
,
blob
)
params
=
if
Gitlab
::
GitalyClient
.
feature_enabled?
(
:
project
_raw_show
)
params
=
if
Gitlab
::
GitalyClient
.
feature_enabled?
(
:
workhorse
_raw_show
)
{
{
'GitalyServer'
=>
gitaly_server_hash
(
repository
),
'GitalyServer'
=>
gitaly_server_hash
(
repository
),
'GetBlobRequest'
=>
{
'GetBlobRequest'
=>
{
...
...
spec/lib/gitlab/workhorse_spec.rb
View file @
13007368
...
@@ -325,7 +325,7 @@ describe Gitlab::Workhorse, lib: true do
...
@@ -325,7 +325,7 @@ describe Gitlab::Workhorse, lib: true do
subject
{
described_class
.
send_git_blob
(
repository
,
blob
)
}
subject
{
described_class
.
send_git_blob
(
repository
,
blob
)
}
context
'when Gitaly
project
_raw_show feature is enabled'
do
context
'when Gitaly
workhorse
_raw_show feature is enabled'
do
it
'sets the header correctly'
do
it
'sets the header correctly'
do
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
...
@@ -345,7 +345,7 @@ describe Gitlab::Workhorse, lib: true do
...
@@ -345,7 +345,7 @@ describe Gitlab::Workhorse, lib: true do
end
end
end
end
context
'when Gitaly
project
_raw_show feature is disabled'
,
skip_gitaly_mock:
true
do
context
'when Gitaly
workhorse
_raw_show feature is disabled'
,
skip_gitaly_mock:
true
do
it
'sets the header correctly'
do
it
'sets the header correctly'
do
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
key
,
command
,
params
=
decode_workhorse_header
(
subject
)
...
...
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