Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

3 files changed, 8 insertions, 14 deletions

diff --git a/app/services/merge_requests/approval_service.rb b/app/services/merge_requests/approval_service.rb
index e3f0758699b..b8d817a15f3 100644
--- a/app/services/merge_requests/approval_service.rb
+++ b/app/services/merge_requests/approval_service.rb
@@ -16,7 +16,7 @@ module MergeRequests
       mark_pending_todos_as_done(merge_request)
       execute_approval_hooks(merge_request, current_user)
       remove_attention_requested(merge_request)
-      merge_request_activity_counter.track_approve_mr_action(user: current_user)
+      merge_request_activity_counter.track_approve_mr_action(user: current_user, merge_request: merge_request)
 
       success
     end
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index 2b6a66b9dee..9bd38478796 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -128,13 +128,8 @@ module MergeRequests
       if draft_event = params.delete(:wip_event)
         # We update the title that is provided in the params or we use the mr title
         title = params[:title] || merge_request.title
-        # Supports both `wip` and `draft` permutations of draft_event
-        # This support can be removed >= %15.2
-        #
         params[:title] = case draft_event
-                         when 'wip' then MergeRequest.draft_title(title)
                          when 'draft' then MergeRequest.draft_title(title)
-                         when 'unwip' then MergeRequest.draftless_title(title)
                          when 'ready' then MergeRequest.draftless_title(title)
                          end
       end
@@ -190,8 +185,11 @@ module MergeRequests
 
     def create_pipeline_for(merge_request, user, async: false)
       if async
-        # TODO: pass push_options to worker
-        MergeRequests::CreatePipelineWorker.perform_async(project.id, user.id, merge_request.id)
+        MergeRequests::CreatePipelineWorker.perform_async(
+          project.id,
+          user.id,
+          merge_request.id,
+          params.slice(:push_options).deep_stringify_keys)
       else
         MergeRequests::CreatePipelineService
           .new(project: project, current_user: user, params: params.slice(:push_options))
diff --git a/app/services/merge_requests/create_pipeline_service.rb b/app/services/merge_requests/create_pipeline_service.rb
index 37c734613e7..c6a91a3b61e 100644
--- a/app/services/merge_requests/create_pipeline_service.rb
+++ b/app/services/merge_requests/create_pipeline_service.rb
@@ -50,12 +50,8 @@ module MergeRequests
     end
 
     def can_create_pipeline_in_target_project?(merge_request)
-      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) &&
-          can_update_source_branch_in_target_project?(merge_request)
-      end
+      can?(current_user, :create_pipeline, merge_request.target_project) &&
+        can_update_source_branch_in_target_project?(merge_request)
     end
 
     def can_update_source_branch_in_target_project?(merge_request)