Automatic merge of gitlab-org/gitlab-ce master

app/services/labels/promote_service.rb

@@ -57,7 +57,7 @@ module Labels
     def update_issuables(new_label, label_ids)
       LabelLink
         .where(label: label_ids)
-        .update_all(label_id: new_label)
+        .update_all(label_id: new_label.id)
     end
     # rubocop: enable CodeReuse/ActiveRecord
 
@@ -65,7 +65,7 @@ module Labels
     def update_resource_label_events(new_label, label_ids)
       ResourceLabelEvent
         .where(label: label_ids)
-        .update_all(label_id: new_label)
+        .update_all(label_id: new_label.id)
     end
     # rubocop: enable CodeReuse/ActiveRecord
 
@@ -73,7 +73,7 @@ module Labels
     def update_issue_board_lists(new_label, label_ids)
       List
         .where(label: label_ids)
-        .update_all(label_id: new_label)
+        .update_all(label_id: new_label.id)
     end
     # rubocop: enable CodeReuse/ActiveRecord
 
@@ -81,7 +81,7 @@ module Labels
     def update_priorities(new_label, label_ids)
       LabelPriority
         .where(label: label_ids)
-        .update_all(label_id: new_label)
+        .update_all(label_id: new_label.id)
     end
     # rubocop: enable CodeReuse/ActiveRecord
 

changelogs/unreleased/deprecated-delete-all-params.yml

+---
+title: 'Fix deprecation: Passing conditions to delete_all is deprecated'
+merge_request: 23817
+author: Jasper Maes
+type: other

changelogs/unreleased/deprecated-passing-activerecord-objects.yml

+---
+title: 'Fix deprecation: Passing ActiveRecord::Base objects to sanitize_sql_hash_for_assignment'
+merge_request: 23818
+author: Jasper Maes
+type: other

lib/api/commit_statuses.rb

@@ -116,7 +116,7 @@ module API
           end
 
           MergeRequest.where(source_project: @project, source_branch: ref)
-            .update_all(head_pipeline_id: pipeline) if pipeline.latest?
+            .update_all(head_pipeline_id: pipeline.id) if pipeline.latest?
 
           present status, with: Entities::CommitStatus
         rescue StateMachines::InvalidTransition => e

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