6 files changed, 18 insertions, 8 deletions
diff --git a/app/services/clusters/create_service.rb b/app/services/clusters/create_service.rb
index c6e955800af..cd843b8ffa8 100644
--- a/app/services/clusters/create_service.rb
+++ b/app/services/clusters/create_service.rb
@@ -9,9 +9,9 @@ module Clusters
     end
 
     def execute(project:, access_token: nil)
-      raise ArgumentError.new(_('Instance does not support multiple Kubernetes clusters')) unless can_create_cluster?(project)
+      raise ArgumentError, _('Instance does not support multiple Kubernetes clusters') unless can_create_cluster?(project)
 
-      cluster_params = params.merge(user: current_user, projects: [project])
+      cluster_params = params.merge(user: current_user, cluster_type: :project_type, projects: [project])
       cluster_params[:provider_gcp_attributes].try do |provider|
         provider[:access_token] = access_token
       end
diff --git a/app/services/delete_merged_branches_service.rb b/app/services/delete_merged_branches_service.rb
index ced87a1c37a..80de897e94b 100644
--- a/app/services/delete_merged_branches_service.rb
+++ b/app/services/delete_merged_branches_service.rb
@@ -24,8 +24,8 @@ class DeleteMergedBranchesService < BaseService
   # rubocop: disable CodeReuse/ActiveRecord
   def merge_request_branch_names
     # reorder(nil) is necessary for SELECT DISTINCT because default scope adds an ORDER BY
-    source_names = project.origin_merge_requests.opened.reorder(nil).uniq.pluck(:source_branch)
-    target_names = project.merge_requests.opened.reorder(nil).uniq.pluck(:target_branch)
+    source_names = project.origin_merge_requests.opened.reorder(nil).distinct.pluck(:source_branch)
+    target_names = project.merge_requests.opened.reorder(nil).distinct.pluck(:target_branch)
     (source_names + target_names).uniq
   end
   # rubocop: enable CodeReuse/ActiveRecord
diff --git a/app/services/labels/transfer_service.rb b/app/services/labels/transfer_service.rb
index 52360f775dc..9cbc9fef529 100644
--- a/app/services/labels/transfer_service.rb
+++ b/app/services/labels/transfer_service.rb
@@ -40,7 +40,7 @@ module Labels
           group_labels_applied_to_merge_requests
         ])
         .reorder(nil)
-        .uniq
+        .distinct
     end
     # rubocop: enable CodeReuse/ActiveRecord
 
diff --git a/app/services/merge_requests/get_urls_service.rb b/app/services/merge_requests/get_urls_service.rb
index 7c88c9abb41..35a22449e34 100644
--- a/app/services/merge_requests/get_urls_service.rb
+++ b/app/services/merge_requests/get_urls_service.rb
@@ -50,8 +50,8 @@ module MergeRequests
     end
 
     def url_for_new_merge_request(branch_name)
-      merge_request_params = { source_branch: branch_name }
-      url = Gitlab::Routing.url_helpers.project_new_merge_request_url(project, merge_request: merge_request_params)
+      url = Gitlab::Routing.url_helpers.project_new_merge_request_url(project, branch_name)
+
       { branch_name: branch_name, url: url, new_merge_request: true }
     end
 
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb
index fb44f809c41..70a67baa01c 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -49,6 +49,11 @@ module MergeRequests
       end
     end
 
+    # Overridden in EE.
+    def hooks_validation_pass?(_merge_request)
+      true
+    end
+
     private
 
     def error_check!
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index b03d14fa3cc..f01872b205e 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -85,7 +85,7 @@ module MergeRequests
         .where.not(target_project: @project).to_a
 
       filter_merge_requests(merge_requests).each do |merge_request|
-        if merge_request.source_branch == @push.branch_name || @push.force_push?
+        if branch_and_project_match?(merge_request) || @push.force_push?
           merge_request.reload_diff(current_user)
         else
           mr_commit_ids = merge_request.commit_shas
@@ -104,6 +104,11 @@ module MergeRequests
     end
     # rubocop: enable CodeReuse/ActiveRecord
 
+    def branch_and_project_match?(merge_request)
+      merge_request.source_project == @project &&
+        merge_request.source_branch == @push.branch_name
+    end
+
     def reset_merge_when_pipeline_succeeds
       merge_requests_for_source_branch.each(&:reset_merge_when_pipeline_succeeds)
     end