Merge branch '58583-confidential-mr-branch-backend' into 'master'

Support creating an MR/branch on a fork from an issue

See merge request gitlab-org/gitlab-ce!29831

4 files changed, 45 insertions, 15 deletions

diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index da5efe4f21c..d77f64a84f5 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -68,8 +68,9 @@ class Projects::BranchesController < Projects::ApplicationController
     success = (result[:status] == :success)
 
     if params[:issue_iid] && success
-      issue = IssuesFinder.new(current_user, project_id: @project.id).find_by(iid: params[:issue_iid])
-      SystemNoteService.new_issue_branch(issue, @project, current_user, branch_name) if issue
+      target_project = confidential_issue_project || @project
+      issue = IssuesFinder.new(current_user, project_id: target_project.id).find_by(iid: params[:issue_iid])
+      SystemNoteService.new_issue_branch(issue, target_project, current_user, branch_name, branch_project: @project) if issue
     end
 
     respond_to do |format|
@@ -166,4 +167,15 @@ class Projects::BranchesController < Projects::ApplicationController
       @branches = Kaminari.paginate_array(@branches).page(params[:page])
     end
   end
+
+  def confidential_issue_project
+    return unless Feature.enabled?(:create_confidential_merge_request, @project)
+    return if params[:confidential_issue_project_id].blank?
+
+    confidential_issue_project = Project.find(params[:confidential_issue_project_id])
+
+    return unless can?(current_user, :update_issue, confidential_issue_project)
+
+    confidential_issue_project
+  end
 end
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index f221f0363d3..e275b417784 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -172,6 +172,7 @@ class Projects::IssuesController < Projects::ApplicationController
 
   def create_merge_request
     create_params = params.slice(:branch_name, :ref).merge(issue_iid: issue.iid)
+    create_params[:target_project_id] = params[:target_project_id] if Feature.enabled?(:create_confidential_merge_request, @project)
     result = ::MergeRequests::CreateFromIssueService.new(project, current_user, create_params).execute
 
     if result[:status] == :success
diff --git a/app/services/merge_requests/create_from_issue_service.rb b/app/services/merge_requests/create_from_issue_service.rb
index e69791872cc..2a217a6f689 100644
--- a/app/services/merge_requests/create_from_issue_service.rb
+++ b/app/services/merge_requests/create_from_issue_service.rb
@@ -6,17 +6,20 @@ module MergeRequests
       # branch - the name of new branch
       # ref    - the source of new branch.
 
-      @branch_name = params[:branch_name]
-      @issue_iid   = params[:issue_iid]
-      @ref         = params[:ref]
+      @branch_name       = params[:branch_name]
+      @issue_iid         = params[:issue_iid]
+      @ref               = params[:ref]
+      @target_project_id = params[:target_project_id]
 
       super(project, user)
     end
 
     def execute
+      return error('Project not found') if target_project.blank?
+      return error('Not allowed to create merge request') unless can_create_merge_request?
       return error('Invalid issue iid') unless @issue_iid.present? && issue.present?
 
-      result = CreateBranchService.new(project, current_user).execute(branch_name, ref)
+      result = CreateBranchService.new(target_project, current_user).execute(branch_name, ref)
       return result if result[:status] == :error
 
       new_merge_request = create(merge_request)
@@ -26,7 +29,7 @@ module MergeRequests
 
         success(new_merge_request)
       else
-        SystemNoteService.new_issue_branch(issue, project, current_user, branch_name)
+        SystemNoteService.new_issue_branch(issue, project, current_user, branch_name, branch_project: target_project)
 
         error(new_merge_request.errors)
       end
@@ -34,6 +37,10 @@ module MergeRequests
 
     private
 
+    def can_create_merge_request?
+      can?(current_user, :create_merge_request_from, target_project)
+    end
+
     # rubocop: disable CodeReuse/ActiveRecord
     def issue
       @issue ||= IssuesFinder.new(current_user, project_id: project.id).find_by(iid: @issue_iid)
@@ -45,21 +52,21 @@ module MergeRequests
     end
 
     def ref
-      return @ref if project.repository.branch_exists?(@ref)
+      return @ref if target_project.repository.branch_exists?(@ref)
 
-      project.default_branch || 'master'
+      target_project.default_branch || 'master'
     end
 
     def merge_request
-      MergeRequests::BuildService.new(project, current_user, merge_request_params).execute
+      MergeRequests::BuildService.new(target_project, current_user, merge_request_params).execute
     end
 
     def merge_request_params
       {
         issue_iid: @issue_iid,
-        source_project_id: project.id,
+        source_project_id: target_project.id,
         source_branch: branch_name,
-        target_project_id: project.id,
+        target_project_id: target_project.id,
         target_branch: ref
       }
     end
@@ -67,5 +74,14 @@ module MergeRequests
     def success(merge_request)
       super().merge(merge_request: merge_request)
     end
+
+    def target_project
+      @target_project ||=
+        if @target_project_id.present?
+          project.forks.find_by_id(@target_project_id)
+        else
+          project
+        end
+    end
   end
 end
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 1390f7cdf46..8f7cfe582ca 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -404,8 +404,9 @@ module SystemNoteService
   # Example note text:
   #
   #   "created branch `201-issue-branch-button`"
-  def new_issue_branch(issue, project, author, branch)
-    link = url_helpers.project_compare_path(project, from: project.default_branch, to: branch)
+  def new_issue_branch(issue, project, author, branch, branch_project: nil)
+    branch_project ||= project
+    link = url_helpers.project_compare_path(branch_project, from: branch_project.default_branch, to: branch)
 
     body = "created branch [`#{branch}`](#{link}) to address this issue"
 
@@ -413,7 +414,7 @@ module SystemNoteService
   end
 
   def new_merge_request(issue, project, author, merge_request)
-    body = "created merge request #{merge_request.to_reference} to address this issue"
+    body = "created merge request #{merge_request.to_reference(project)} to address this issue"
 
     create_note(NoteSummary.new(issue, project, author, body, action: 'merge'))
   end