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

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

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

app/services/merge_requests/create_from_issue_service.rb

@@ -9,14 +9,17 @@ module MergeRequests
       @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

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

spec/controllers/projects/branches_controller_spec.rb

@@ -92,7 +92,7 @@ describe Projects::BranchesController do
       end
 
       it 'posts a system note' do
-        expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, "1-feature-branch")
+        expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, "1-feature-branch", branch_project: project)
 
         post :create,
              params: {
@@ -103,6 +103,75 @@ describe Projects::BranchesController do
              }
       end
 
+      context 'confidential_issue_project_id is present' do
+        let(:confidential_issue_project) { create(:project) }
+
+        def create_branch_with_confidential_issue_project
+          post(
+            :create,
+            params: {
+              namespace_id: project.namespace,
+              project_id: project,
+              branch_name: branch,
+              confidential_issue_project_id: confidential_issue_project.id,
+              issue_iid: issue.iid
+            }
+          )
+        end
+
+        context 'create_confidential_merge_request feature is enabled' do
+          before do
+            stub_feature_flags(create_confidential_merge_request: true)
+          end
+
+          context 'user cannot update issue' do
+            let(:issue) { create(:issue, project: confidential_issue_project) }
+
+            it 'does not post a system note' do
+              expect(SystemNoteService).not_to receive(:new_issue_branch)
+
+              create_branch_with_confidential_issue_project
+            end
+          end
+
+          context 'user can update issue' do
+            before do
+              confidential_issue_project.add_reporter(user)
+            end
+
+            context 'issue is under the specified project' do
+              let(:issue) { create(:issue, project: confidential_issue_project) }
+
+              it 'posts a system note' do
+                expect(SystemNoteService).to receive(:new_issue_branch).with(issue, confidential_issue_project, user, "1-feature-branch", branch_project: project)
+
+                create_branch_with_confidential_issue_project
+              end
+            end
+
+            context 'issue is not under the specified project' do
+              it 'does not post a system note' do
+                expect(SystemNoteService).not_to receive(:new_issue_branch)
+
+                create_branch_with_confidential_issue_project
+              end
+            end
+          end
+        end
+
+        context 'create_confidential_merge_request feature is disabled' do
+          before do
+            stub_feature_flags(create_confidential_merge_request: false)
+          end
+
+          it 'posts a system note on project' do
+            expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, "1-feature-branch", branch_project: project)
+
+            create_branch_with_confidential_issue_project
+          end
+        end
+      end
+
       context 'repository-less project' do
         let(:project) { create :project }
 

spec/controllers/projects/issues_controller_spec.rb

@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe Projects::IssuesController do
+  include ProjectForksHelper
+
   let(:project) { create(:project) }
   let(:user)    { create(:user) }
   let(:issue)   { create(:issue, project: project) }
@@ -1130,6 +1132,7 @@ describe Projects::IssuesController do
   end
 
   describe 'POST create_merge_request' do
+    let(:target_project_id) { nil }
     let(:project) { create(:project, :repository, :public) }
 
     before do
@@ -1163,13 +1166,42 @@ describe Projects::IssuesController do
       expect(response).to have_gitlab_http_status(404)
     end
 
+    context 'target_project_id is set' do
+      let(:target_project) { fork_project(project, user, repository: true) }
+      let(:target_project_id) { target_project.id }
+
+      context 'create_confidential_merge_request feature is enabled' do
+        before do
+          stub_feature_flags(create_confidential_merge_request: true)
+        end
+
+        it 'creates a new merge request' do
+          expect { create_merge_request }.to change(target_project.merge_requests, :count).by(1)
+        end
+      end
+
+      context 'create_confidential_merge_request feature is disabled' do
+        before do
+          stub_feature_flags(create_confidential_merge_request: false)
+        end
+
+        it 'creates a new merge request' do
+          expect { create_merge_request }.to change(project.merge_requests, :count).by(1)
+        end
+      end
+    end
+
     def create_merge_request
-      post :create_merge_request, params: {
+      post(
+        :create_merge_request,
+        params: {
           namespace_id: project.namespace.to_param,
           project_id: project.to_param,
-                                    id: issue.to_param
+          id: issue.to_param,
+          target_project_id: target_project_id
         },
         format: :json
+      )
     end
   end
 

spec/services/merge_requests/create_from_issue_service_spec.rb

@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe MergeRequests::CreateFromIssueService do
+  include ProjectForksHelper
+
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:label_ids) { create_pair(:label, project: project).map(&:id) }
@@ -10,57 +12,39 @@ describe MergeRequests::CreateFromIssueService do
   let(:issue) { create(:issue, project: project, milestone_id: milestone_id) }
   let(:custom_source_branch) { 'custom-source-branch' }
 
-  subject(:service) { described_class.new(project, user, issue_iid: issue.iid) }
-  subject(:service_with_custom_source_branch) { described_class.new(project, user, issue_iid: issue.iid, branch_name: custom_source_branch) }
+  subject(:service) { described_class.new(project, user, service_params) }
+  subject(:service_with_custom_source_branch) { described_class.new(project, user, branch_name: custom_source_branch, **service_params) }
 
   before do
     project.add_developer(user)
   end
 
   describe '#execute' do
-    it 'returns an error with invalid issue iid' do
-      result = described_class.new(project, user, issue_iid: -1).execute
+    shared_examples_for 'a service that creates a merge request from an issue' do
+      it 'returns an error when user can not create merge request on target project' do
+        result = described_class.new(project, create(:user), service_params).execute
 
         expect(result[:status]).to eq(:error)
-      expect(result[:message]).to eq('Invalid issue iid')
-    end
-
-    it 'delegates issue search to IssuesFinder' do
-      expect_any_instance_of(IssuesFinder).to receive(:find_by).once.and_call_original
-
-      described_class.new(project, user, issue_iid: -1).execute
+        expect(result[:message]).to eq('Not allowed to create merge request')
       end
 
-    it "inherits labels" do
-      issue.assign_attributes(label_ids: label_ids)
-
-      result = service.execute
-
-      expect(result[:merge_request].label_ids).to eq(label_ids)
-    end
-
-    it "inherits milestones" do
-      result = service.execute
-
-      expect(result[:merge_request].milestone_id).to eq(milestone_id)
-    end
-
-    it 'delegates the branch creation to CreateBranchService' do
-      expect_any_instance_of(CreateBranchService).to receive(:execute).once.and_call_original
+      it 'returns an error with invalid issue iid' do
+        result = described_class.new(project, user, issue_iid: -1).execute
 
-      service.execute
+        expect(result[:status]).to eq(:error)
+        expect(result[:message]).to eq('Invalid issue iid')
       end
 
       it 'creates a branch based on issue title' do
         service.execute
 
-      expect(project.repository.branch_exists?(issue.to_branch_name)).to be_truthy
+        expect(target_project.repository.branch_exists?(issue.to_branch_name)).to be_truthy
       end
 
       it 'creates a branch using passed name' do
         service_with_custom_source_branch.execute
 
-      expect(project.repository.branch_exists?(custom_source_branch)).to be_truthy
+        expect(target_project.repository.branch_exists?(custom_source_branch)).to be_truthy
       end
 
       it 'creates the new_merge_request system note' do
@@ -70,21 +54,15 @@ describe MergeRequests::CreateFromIssueService do
       end
 
       it 'creates the new_issue_branch system note when the branch could be created but the merge_request cannot be created' do
-      project.project_feature.update!(merge_requests_access_level: ProjectFeature::DISABLED)
+        expect_any_instance_of(MergeRequest).to receive(:valid?).at_least(:once).and_return(false)
 
-      expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, issue.to_branch_name)
+        expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, issue.to_branch_name, branch_project: target_project)
 
         service.execute
       end
 
       it 'creates a merge request' do
-      expect { service.execute }.to change(project.merge_requests, :count).by(1)
-    end
-
-    it 'sets the merge request title to: "WIP: Resolves "$issue-title"' do
-      result = service.execute
-
-      expect(result[:merge_request].title).to eq("WIP: Resolve \"#{issue.title}\"")
+        expect { service.execute }.to change(target_project.merge_requests, :count).by(1)
       end
 
       it 'sets the merge request author to current user' do
@@ -108,7 +86,7 @@ describe MergeRequests::CreateFromIssueService do
       it 'sets the merge request target branch to the project default branch' do
         result = service.execute
 
-      expect(result[:merge_request].target_branch).to eq(project.default_branch)
+        expect(result[:merge_request].target_branch).to eq(target_project.default_branch)
       end
 
       it 'executes quick actions if the build service sets them in the description' do
@@ -124,7 +102,7 @@ describe MergeRequests::CreateFromIssueService do
       end
 
       context 'when ref branch is set' do
-      subject { described_class.new(project, user, issue_iid: issue.iid, ref: 'feature').execute }
+        subject { described_class.new(project, user, ref: 'feature', **service_params).execute }
 
         it 'sets the merge request source branch to the new issue branch' do
           expect(subject[:merge_request].source_branch).to eq(issue.to_branch_name)
@@ -135,14 +113,73 @@ describe MergeRequests::CreateFromIssueService do
         end
 
         context 'when ref branch does not exist' do
-        subject { described_class.new(project, user, issue_iid: issue.iid, ref: 'no-such-branch').execute }
+          subject { described_class.new(project, user, ref: 'no-such-branch', **service_params).execute }
 
           it 'creates a merge request' do
-          expect { subject }.to change(project.merge_requests, :count).by(1)
+            expect { subject }.to change(target_project.merge_requests, :count).by(1)
           end
 
           it 'sets the merge request target branch to the project default branch' do
-          expect(subject[:merge_request].target_branch).to eq(project.default_branch)
+            expect(subject[:merge_request].target_branch).to eq(target_project.default_branch)
+          end
+        end
+      end
+    end
+
+    context 'no target_project_id specified' do
+      let(:service_params) { { issue_iid: issue.iid } }
+      let(:target_project) { project }
+
+      it_behaves_like 'a service that creates a merge request from an issue'
+
+      it "inherits labels" do
+        issue.assign_attributes(label_ids: label_ids)
+
+        result = service.execute
+
+        expect(result[:merge_request].label_ids).to eq(label_ids)
+      end
+
+      it "inherits milestones" do
+        result = service.execute
+
+        expect(result[:merge_request].milestone_id).to eq(milestone_id)
+      end
+
+      it 'sets the merge request title to: "WIP: Resolves "$issue-title"' do
+        result = service.execute
+
+        expect(result[:merge_request].title).to eq("WIP: Resolve \"#{issue.title}\"")
+      end
+    end
+
+    context 'target_project_id is specified' do
+      let(:service_params) { { issue_iid: issue.iid, target_project_id: target_project.id } }
+
+      context 'target project is not a fork of the project' do
+        let(:target_project) { create(:project, :repository) }
+
+        it 'returns an error about not finding the project' do
+          result = service.execute
+
+          expect(result[:status]).to eq(:error)
+          expect(result[:message]).to eq('Project not found')
+        end
+
+        it 'does not create merge request' do
+          expect { service.execute }.to change(target_project.merge_requests, :count).by(0)
+        end
+      end
+
+      context 'target project is a fork of project project' do
+        let(:target_project) { fork_project(project, user, repository: true) }
+
+        it_behaves_like 'a service that creates a merge request from an issue'
+
+        it 'sets the merge request title to: "WIP: $issue-branch-name' do
+          result = service.execute
+
+          expect(result[:merge_request].title).to eq("WIP: #{issue.to_branch_name.titleize.humanize}")
         end
       end
     end

spec/services/system_note_service_spec.rb

@@ -454,16 +454,32 @@ describe SystemNoteService do
   end
 
   describe '.new_issue_branch' do
-    subject { described_class.new_issue_branch(noteable, project, author, "1-mepmep") }
+    let(:branch) { '1-mepmep' }
 
+    subject { described_class.new_issue_branch(noteable, project, author, branch, branch_project: branch_project) }
+
+    shared_examples_for 'a system note for new issue branch' do
       it_behaves_like 'a system note' do
         let(:action) { 'branch' }
       end
 
       context 'when a branch is created from the new branch button' do
         it 'sets the note text' do
-        expect(subject.note).to start_with("created branch [`1-mepmep`]")
+          expect(subject.note).to start_with("created branch [`#{branch}`]")
+        end
+      end
+    end
+
+    context 'branch_project is set' do
+      let(:branch_project) { create(:project, :repository) }
+
+      it_behaves_like 'a system note for new issue branch'
     end
+
+    context 'branch_project is not set' do
+      let(:branch_project) { nil }
+
+      it_behaves_like 'a system note for new issue branch'
     end
   end
 
@@ -477,7 +493,7 @@ describe SystemNoteService do
     end
 
     it 'sets the new merge request note text' do
-      expect(subject.note).to eq("created merge request #{merge_request.to_reference} to address this issue")
+      expect(subject.note).to eq("created merge request #{merge_request.to_reference(project)} to address this issue")
     end
   end