Commit 30d2a3e6 authored by Stan Hu's avatar Stan Hu

Merge branch 'deprecated-delete-all-params' into 'master'

Fix deprecation: Passing conditions to delete_all is deprecated

See merge request gitlab-org/gitlab-ce!23817
parents 1bfb71a8 921bc753
---
title: 'Fix deprecation: Passing conditions to delete_all is deprecated'
merge_request: 23817
author: Jasper Maes
type: other
...@@ -105,7 +105,7 @@ describe MergeRequestDiff do ...@@ -105,7 +105,7 @@ describe MergeRequestDiff do
context 'when the raw diffs are empty' do context 'when the raw diffs are empty' do
before do before do
MergeRequestDiffFile.delete_all(merge_request_diff_id: diff_with_commits.id) MergeRequestDiffFile.where(merge_request_diff_id: diff_with_commits.id).delete_all
end end
it 'returns an empty DiffCollection' do it 'returns an empty DiffCollection' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment