diff options
author | Robert Speicher <robert@gitlab.com> | 2017-07-24 13:57:07 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-07-24 13:57:07 +0000 |
commit | 157e5d0c3a9e73bdd42f08785e7197853e8144a7 (patch) | |
tree | 5a9d711c65772cd165fb26f01083fde0435c9f98 /spec | |
parent | 87521660e89872b568ff6227077381bf2c5bad7e (diff) | |
parent | 1300736850c0a2246b346c31680aae8e2c6baa4c (diff) | |
download | gitlab-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
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/workhorse_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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) |