diff options
author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-09-21 18:34:32 +0200 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-07 11:46:23 +0200 |
commit | 7c00b53812895970fdb00cf1d27b059bb15815cd (patch) | |
tree | 42ec37cf257cd11abd8469b6fb7921bc7f204043 /app/controllers/projects/merge_requests/creations_controller.rb | |
parent | 70716a1292ca5910908ba37a9d113c8b5a221bb7 (diff) | |
download | gitlab-ce-7c00b53812895970fdb00cf1d27b059bb15815cd.tar.gz |
Find branches in all projects in the fork network
Diffstat (limited to 'app/controllers/projects/merge_requests/creations_controller.rb')
-rw-r--r-- | app/controllers/projects/merge_requests/creations_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index 1096afbb798..99dc3dda9e7 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -120,10 +120,13 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap end def selected_target_project - if @project.id.to_s == params[:target_project_id] || @project.forked_project_link.nil? + if @project.id.to_s == params[:target_project_id] || !@project.forked? @project + elsif params[:target_project_id].present? + MergeRequestTargetProjectFinder.new(current_user: current_user, source_project: @project) + .execute.find(params[:target_project_id]) else - @project.forked_project_link.forked_from_project + @project.forked_from_project end end end |