diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-09 15:38:38 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-09 15:38:38 +0000 |
commit | c1174901c67f76a10f5a07ce3990af00ca1e0b05 (patch) | |
tree | 165476525fdb91309c2634505493766a836adffe /spec/services/git_push_service_spec.rb | |
parent | 5354c29352416a606f16c58e65bfbafebfa1ef3c (diff) | |
parent | 3107f2e460d8db35f7ddd0cc5f68575233bfc133 (diff) | |
download | gitlab-ce-c1174901c67f76a10f5a07ce3990af00ca1e0b05.tar.gz |
Merge branch 'deltas-only' into 'master'
Don't use DiffCollection for deltas
See merge request !11201
Diffstat (limited to 'spec/services/git_push_service_spec.rb')
-rw-r--r-- | spec/services/git_push_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb index 8c2415b4e07..ab06f45dbb9 100644 --- a/spec/services/git_push_service_spec.rb +++ b/spec/services/git_push_service_spec.rb @@ -584,7 +584,7 @@ describe GitPushService, services: true do commit = double(:commit) diff = double(:diff, new_path: 'README.md') - expect(commit).to receive(:raw_diffs).with(deltas_only: true). + expect(commit).to receive(:raw_deltas). and_return([diff]) service.push_commits = [commit] |