diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-14 06:11:36 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-14 06:11:36 +0000 |
| commit | 30d2a3e6163b21ae0f2269eba3e5e0e04c749e63 (patch) | |
| tree | 96d1e6998f8605e7f3eaac590174cbe8baecf0ea | |
| parent | 1bfb71a888037ab4eb9323c9a42f46a24f910739 (diff) | |
| parent | 921bc753bf7dc85dd0c3083bacb7f633ea2b51c9 (diff) | |
| download | gitlab-ce-30d2a3e6163b21ae0f2269eba3e5e0e04c749e63.tar.gz | |
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
| -rw-r--r-- | changelogs/unreleased/deprecated-delete-all-params.yml | 5 | ||||
| -rw-r--r-- | spec/models/merge_request_diff_spec.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/deprecated-delete-all-params.yml b/changelogs/unreleased/deprecated-delete-all-params.yml new file mode 100644 index 00000000000..e23fe92a738 --- /dev/null +++ b/changelogs/unreleased/deprecated-delete-all-params.yml @@ -0,0 +1,5 @@ +--- +title: 'Fix deprecation: Passing conditions to delete_all is deprecated' +merge_request: 23817 +author: Jasper Maes +type: other diff --git a/spec/models/merge_request_diff_spec.rb b/spec/models/merge_request_diff_spec.rb index cbe60b3a4a5..33e984dc399 100644 --- a/spec/models/merge_request_diff_spec.rb +++ b/spec/models/merge_request_diff_spec.rb @@ -105,7 +105,7 @@ describe MergeRequestDiff do context 'when the raw diffs are empty' 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 it 'returns an empty DiffCollection' do |