|
|
|
@ -26,10 +26,8 @@ class PullRequestsController < ApplicationController
|
|
|
|
|
@target_project = []
|
|
|
|
|
if @project.forked_from_project_id
|
|
|
|
|
@forked_project = Project.find(@project.forked_from_project_id)
|
|
|
|
|
unless @forked_project.blank?
|
|
|
|
|
@target_project << "#{get_user_name(@forked_project.user_id)}/#{@forked_project.name}"
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
# @forked_rev = @g.branches(forked_project.gpid).map{|b| b.name}
|
|
|
|
|
@target_project << "#{get_user_name(@project.user_id)}/#{@project.name}"
|
|
|
|
|
|
|
|
|
@ -56,9 +54,14 @@ class PullRequestsController < ApplicationController
|
|
|
|
|
description = params[:description]
|
|
|
|
|
source_branch = params[:source_branch]
|
|
|
|
|
target_branch = params[:target_branch]
|
|
|
|
|
target_project = 1549
|
|
|
|
|
begin
|
|
|
|
|
# 如果传送了目标项目ID,则PR请求发至目标项目
|
|
|
|
|
if params[:target_project_id]
|
|
|
|
|
target_project_id = params[:target_project_id]
|
|
|
|
|
request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch, :target_project_id => target_project_id)
|
|
|
|
|
else
|
|
|
|
|
request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch)
|
|
|
|
|
end
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.js{redirect_to project_pull_request_path(request.id, :project_id => @project.id)}
|
|
|
|
|
end
|
|
|
|
|