diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-10-23 15:17:56 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-10-23 15:29:00 +0300 |
| commit | 255e5ae121441259bc10c649f74e4de8d5076380 (patch) | |
| tree | 097e1df198f7702a4eb1f2e8cd78084938230367 | |
| parent | 904688f0c8200ea2a69ecbd5c88ffe87ccdd5b51 (diff) | |
| download | gitlab-ce-remove_diffs_from_db_ce_37639.tar.gz | |
add item to chnagelogremove_diffs_from_db_ce_37639
| -rw-r--r-- | changelogs/unreleased/remove_diffs_from_db_ce_37639.yml | 5 | ||||
| -rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/changelogs/unreleased/remove_diffs_from_db_ce_37639.yml b/changelogs/unreleased/remove_diffs_from_db_ce_37639.yml new file mode 100644 index 00000000000..4a0991ee2fa --- /dev/null +++ b/changelogs/unreleased/remove_diffs_from_db_ce_37639.yml @@ -0,0 +1,5 @@ +--- +title: Delete old (non-latest) merge request diffs after merge +merge_request: +author: +type: changed diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index 7b5d76038ac..f8a7a059629 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -15,10 +15,6 @@ describe MergeRequests::MergeService do context 'diff files' do let(:service) { described_class.new(project, user) } - # before do - # allow(project).to receive(:default_branch).and_return(merge_request.target_branch) - # end - it 'clears non-latest diff files' do merge_request.create_merge_request_diff non_latest_diff = merge_request.create_merge_request_diff |