jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pull_request合并到源项目的问题

This commit is contained in:
huang 2016-11-22 15:05:33 +08:00
parent 79b1cdcf84
commit fca68c24dc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/pull_requests_controller.rb
View File

@ -93,7 +93,7 @@ class PullRequestsController < ApplicationController
# 如果传送了目标项目ID即向fork源项目发送请求
# if params[:forked_project_id] && params[:source_project] == "forked_project_name"
if params[:target_project_id]
target_project_id = params[:target_project_id].to_i
target_project_id = params[:forked_project_id].to_i
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)
@fork_project_name = Project.find(target_project_id).try(:name)
@fork_pr_message = true if @fork_project_name