okpersist-fulll-ref-path-for-mr-pipelines-tmp

1 files changed, 6 insertions, 1 deletions

diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index eaf7189b802..3535227784c 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -69,7 +69,7 @@ module MergeRequests
     end
 
     def create_detached_merge_request_pipeline(merge_request, user)
-      if Feature.enabled?(:use_merge_request_ref_for_detached_merge_request_pipeline, merge_request.source_project, default_enabled: true)
+      if can_use_merge_request_ref?(merge_request)
         Ci::CreatePipelineService.new(merge_request.source_project, user,
                                       ref: merge_request.ref_path)
           .execute(:merge_request_event, merge_request: merge_request)
@@ -80,6 +80,11 @@ module MergeRequests
       end
     end
 
+    def can_use_merge_request_ref?(merge_request)
+      Feature.enabled?(:ci_use_merge_request_ref, project, default_enabled: true) &&
+         !merge_request.for_fork?
+    end
+
     # Returns all origin and fork merge requests from `@project` satisfying passed arguments.
     # rubocop: disable CodeReuse/ActiveRecord
     def merge_requests_for(source_branch, mr_states: [:opened])