diff options
Diffstat (limited to 'app/services/merge_requests/create_pipeline_service.rb')
| -rw-r--r-- | app/services/merge_requests/create_pipeline_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/merge_requests/create_pipeline_service.rb b/app/services/merge_requests/create_pipeline_service.rb index c6a91a3b61e..4f20ade2a42 100644 --- a/app/services/merge_requests/create_pipeline_service.rb +++ b/app/services/merge_requests/create_pipeline_service.rb @@ -50,7 +50,8 @@ module MergeRequests end def can_create_pipeline_in_target_project?(merge_request) - can?(current_user, :create_pipeline, merge_request.target_project) && + merge_request.target_project.ci_allow_fork_pipelines_to_run_in_parent_project? && + can?(current_user, :create_pipeline, merge_request.target_project) && can_update_source_branch_in_target_project?(merge_request) end |