diff options
author | Rémy Coutable <remy@rymai.me> | 2019-07-01 10:54:11 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-07-01 10:54:11 +0000 |
commit | 96080fce7d65e870b309f409e76c794f18d3ee74 (patch) | |
tree | 09e01394f46ae6592b4de3602b735d4be73b5836 /app/controllers/projects/branches_controller.rb | |
parent | 0e8b76e1918a7ca441e9eb98819f10da24e0588a (diff) | |
parent | 6b68acbfe9db1d3c855d7505817ebca62e3a61c1 (diff) | |
download | gitlab-ce-96080fce7d65e870b309f409e76c794f18d3ee74.tar.gz |
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
Diffstat (limited to 'app/controllers/projects/branches_controller.rb')
-rw-r--r-- | app/controllers/projects/branches_controller.rb | 16 |
1 files changed, 14 insertions, 2 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 |