diff options
author | Rémy Coutable <remy@rymai.me> | 2017-10-10 13:22:55 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-10-10 13:22:55 +0000 |
commit | 1fb4215beaa214f22ee59ebf7182a1696ad6baa5 (patch) | |
tree | 835f4336b907e0a54c086e5dee691a85dbd21494 | |
parent | 36ae3bf1ca476515ba66f6e3e505cbb035534764 (diff) | |
parent | 03f3cee0c7f162089f3cdf278eb4420f26d745ab (diff) | |
download | gitlab-ce-1fb4215beaa214f22ee59ebf7182a1696ad6baa5.tar.gz |
Merge branch 'fix/skip-gitaly-mock-linting-error' into 'master'
Fix a liniting error introduced by !14652
See merge request gitlab-org/gitlab-ce!14790
-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 16690f8727d..80bf7986ee0 100644 --- a/spec/lib/gitlab/workhorse_spec.rb +++ b/spec/lib/gitlab/workhorse_spec.rb @@ -86,7 +86,7 @@ describe Gitlab::Workhorse do end end - context 'when Gitaly workhorse_send_git_patch feature is disabled', skip_gitaly_mock: true 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) @@ -159,7 +159,7 @@ describe Gitlab::Workhorse do end end - context 'when Gitaly workhorse_send_git_diff feature is disabled', skip_gitaly_mock: true 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) |