diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 15:09:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 15:09:01 +0300 |
| commit | bd497e352ebd279536ae11855871162e82a3f88c (patch) | |
| tree | 2241444d4be33e199d7011b872713071a8f8cd41 /spec/models | |
| parent | 0388886f9439fa93efea29a159522aec5643f7c8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/repository_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 3d817065963..1e558131dc6 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1622,7 +1622,6 @@ describe Repository do it 'executes the new Gitaly RPC' do expect_any_instance_of(Gitlab::GitalyClient::OperationService).to receive(:rebase) - expect_any_instance_of(Gitlab::GitalyClient::OperationService).not_to receive(:user_rebase) repository.rebase(user, merge_request) end |