Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

2 files changed, 40 insertions, 2 deletions

diff --git a/app/models/merge_request/approval_removal_settings.rb b/app/models/merge_request/approval_removal_settings.rb
new file mode 100644
index 00000000000..b07242e2578
--- /dev/null
+++ b/app/models/merge_request/approval_removal_settings.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class MergeRequest::ApprovalRemovalSettings # rubocop:disable Style/ClassAndModuleChildren
+  include ActiveModel::Validations
+
+  attr_accessor :project
+
+  validate :mutually_exclusive_settings
+
+  def initialize(project, reset_approvals_on_push, selective_code_owner_removals)
+    @project = project
+    @reset_approvals_on_push = reset_approvals_on_push
+    @selective_code_owner_removals = selective_code_owner_removals
+  end
+
+  private
+
+  def selective_code_owner_removals
+    if @selective_code_owner_removals.nil?
+      project.project_setting.selective_code_owner_removals
+    else
+      @selective_code_owner_removals
+    end
+  end
+
+  def reset_approvals_on_push
+    if @reset_approvals_on_push.nil?
+      project.reset_approvals_on_push
+    else
+      @reset_approvals_on_push
+    end
+  end
+
+  def mutually_exclusive_settings
+    return unless selective_code_owner_removals && reset_approvals_on_push
+
+    errors.add(:base, 'selective_code_owner_removals can only be enabled when reset_approvals_on_push is disabled')
+  end
+end
diff --git a/app/models/merge_request/metrics.rb b/app/models/merge_request/metrics.rb
index b984228eb13..c546a5a0025 100644
--- a/app/models/merge_request/metrics.rb
+++ b/app/models/merge_request/metrics.rb
@@ -41,8 +41,7 @@ class MergeRequest::Metrics < ApplicationRecord
 
   def self.total_time_to_merge
     with_valid_time_to_merge
-      .pluck(time_to_merge_expression)
-      .first
+      .pick(time_to_merge_expression)
   end
 end