diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-02-05 10:32:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-02-05 10:32:20 +0000 |
| commit | f5990e444a98dc259e2af8c373910cd9ec15b0bd (patch) | |
| tree | 9f65558897ad2f47d9ccc6dc685a2e4e5c40db87 /spec/lib/gitlab/git/repository_spec.rb | |
| parent | 19277271be890c1f836c38f2ccd5caa40c5765e2 (diff) | |
| parent | e60bf2f256746e49eb79b6cd97dfe2147ea957b1 (diff) | |
| download | gitlab-ce-f5990e444a98dc259e2af8c373910cd9ec15b0bd.tar.gz | |
Merge branch 'gitaly-user-squash' into 'master'
Incorporate OperationService.UserSquash Gitaly RPC
Closes gitaly#991
See merge request gitlab-org/gitlab-ce!16899
Diffstat (limited to 'spec/lib/gitlab/git/repository_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/git/repository_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb index df9f8a84aa5..ec1c7a96f92 100644 --- a/spec/lib/gitlab/git/repository_spec.rb +++ b/spec/lib/gitlab/git/repository_spec.rb @@ -2196,7 +2196,7 @@ describe Gitlab::Git::Repository, seed_helper: true do repository.squash(user, squash_id, opts) end - context 'sparse checkout' do + context 'sparse checkout', :skip_gitaly_mock do let(:expected_files) { %w(files files/js files/js/application.js) } before do |