Add latest changes from gitlab-org/gitlab@master

3 files changed, 22 insertions, 4 deletions

diff --git a/app/services/merge_requests/after_create_service.rb b/app/services/merge_requests/after_create_service.rb
index 77564521d45..f120cb26d22 100644
--- a/app/services/merge_requests/after_create_service.rb
+++ b/app/services/merge_requests/after_create_service.rb
@@ -3,12 +3,19 @@
 module MergeRequests
   class AfterCreateService < MergeRequests::BaseService
     def execute(merge_request)
+      prepare_for_mergeability(merge_request) if early_prepare_for_mergeability?(merge_request)
       prepare_merge_request(merge_request)
-      merge_request.mark_as_unchecked if merge_request.preparing?
+      mark_as_unchecked(merge_request) unless early_prepare_for_mergeability?(merge_request)
     end
 
     private
 
+    def prepare_for_mergeability(merge_request)
+      create_pipeline_for(merge_request, current_user)
+      merge_request.update_head_pipeline
+      mark_as_unchecked(merge_request)
+    end
+
     def prepare_merge_request(merge_request)
       event_service.open_mr(merge_request, current_user)
 
@@ -17,8 +24,10 @@ module MergeRequests
 
       notification_service.new_merge_request(merge_request, current_user)
 
-      create_pipeline_for(merge_request, current_user)
-      merge_request.update_head_pipeline
+      unless early_prepare_for_mergeability?(merge_request)
+        create_pipeline_for(merge_request, current_user)
+        merge_request.update_head_pipeline
+      end
 
       merge_request.diffs(include_stats: false).write_cache
       merge_request.create_cross_references!(current_user)
@@ -37,6 +46,14 @@ module MergeRequests
     def link_lfs_objects(merge_request)
       LinkLfsObjectsService.new(project: merge_request.target_project).execute(merge_request)
     end
+
+    def early_prepare_for_mergeability?(merge_request)
+      Feature.enabled?(:early_prepare_for_mergeability, merge_request.target_project)
+    end
+
+    def mark_as_unchecked(merge_request)
+      merge_request.mark_as_unchecked if merge_request.preparing?
+    end
   end
 end
 
diff --git a/app/services/merge_requests/create_pipeline_service.rb b/app/services/merge_requests/create_pipeline_service.rb
index 6b032545230..9d7f8393ba5 100644
--- a/app/services/merge_requests/create_pipeline_service.rb
+++ b/app/services/merge_requests/create_pipeline_service.rb
@@ -48,7 +48,7 @@ module MergeRequests
     end
 
     def can_create_pipeline_in_target_project?(merge_request)
-      if Gitlab::Ci::Features.disallow_to_create_merge_request_pipelines_in_target_project?(merge_request.target_project)
+      if ::Feature.enabled?(:ci_disallow_to_create_merge_request_pipelines_in_target_project, merge_request.target_project)
         merge_request.for_same_project?
       else
         can?(current_user, :create_pipeline, merge_request.target_project) &&
diff --git a/app/services/merge_requests/toggle_attention_requested_service.rb b/app/services/merge_requests/toggle_attention_requested_service.rb
index 66c5d6fce5d..4e36ae065bb 100644
--- a/app/services/merge_requests/toggle_attention_requested_service.rb
+++ b/app/services/merge_requests/toggle_attention_requested_service.rb
@@ -31,6 +31,7 @@ module MergeRequests
     private
 
     def notity_user
+      notification_service.async.attention_requested_of_merge_request(merge_request, current_user, user)
       todo_service.create_attention_requested_todo(merge_request, current_user, user)
     end