diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-28 09:53:42 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-28 09:53:42 +0000 |
commit | 06afa5a3ff82e2d6edbcf668cc870e625784c09c (patch) | |
tree | 3da93dcc36fc4f481ee1445bf515db53faa3754c /spec | |
parent | ef92eb6b3301a345532ac81552fd5efde3c965da (diff) | |
download | gitlab-ce-06afa5a3ff82e2d6edbcf668cc870e625784c09c.tar.gz |
Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'"
This reverts merge request !18002
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/workhorse_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb index d67bfb37be7..1d0faf56f7c 100644 --- a/spec/lib/gitlab/workhorse_spec.rb +++ b/spec/lib/gitlab/workhorse_spec.rb @@ -55,7 +55,7 @@ describe Gitlab::Workhorse do end end - context 'when Gitaly workhorse_archive feature is disabled', :disable_gitaly do + context 'when Gitaly workhorse_archive feature is disabled', :skip_gitaly_mock do it 'sets the header correctly' do key, command, params = decode_workhorse_header(subject) @@ -100,7 +100,7 @@ describe Gitlab::Workhorse do end end - context 'when Gitaly workhorse_send_git_patch feature is disabled', :disable_gitaly do + context 'when Gitaly workhorse_send_git_patch feature is disabled', :skip_gitaly_mock do it 'sets the header correctly' do key, command, params = decode_workhorse_header(subject) @@ -173,7 +173,7 @@ describe Gitlab::Workhorse do end end - context 'when Gitaly workhorse_send_git_diff feature is disabled', :disable_gitaly do + context 'when Gitaly workhorse_send_git_diff feature is disabled', :skip_gitaly_mock do it 'sets the header correctly' do key, command, params = decode_workhorse_header(subject) @@ -452,7 +452,7 @@ describe Gitlab::Workhorse do end end - context 'when Gitaly workhorse_raw_show feature is disabled', :disable_gitaly do + context 'when Gitaly workhorse_raw_show feature is disabled', :skip_gitaly_mock do it 'sets the header correctly' do key, command, params = decode_workhorse_header(subject) |