summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-07-24 13:57:07 +0000
committerRobert Speicher <robert@gitlab.com>2017-07-24 13:57:07 +0000
commit157e5d0c3a9e73bdd42f08785e7197853e8144a7 (patch)
tree5a9d711c65772cd165fb26f01083fde0435c9f98
parent87521660e89872b568ff6227077381bf2c5bad7e (diff)
parent1300736850c0a2246b346c31680aae8e2c6baa4c (diff)
downloadgitlab-ce-157e5d0c3a9e73bdd42f08785e7197853e8144a7.tar.gz
Merge branch 'fix/use-another-gitaly-feature-name-for-workhorse-send-blob' into 'master'
Use a unique feature name for Workhorse send blob migration See merge request !13031
-rw-r--r--lib/gitlab/workhorse.rb2
-rw-r--r--spec/lib/gitlab/workhorse_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 916ef365d78..5dd8a38fea2 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -62,7 +62,7 @@ module Gitlab
end
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),
'GetBlobRequest' => {
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index 124f66a6e0e..7b39441e76e 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -325,7 +325,7 @@ describe Gitlab::Workhorse, lib: true do
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
key, command, params = decode_workhorse_header(subject)
@@ -345,7 +345,7 @@ describe Gitlab::Workhorse, lib: true do
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
key, command, params = decode_workhorse_header(subject)