floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

cahnge

This commit is contained in:
sylor_huang@126.com 2020-08-15 14:49:52 +08:00
parent 531b66e862
commit fae9df56a4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/pull_requests_controller.rb
View File

@ -68,7 +68,7 @@ class PullRequestsController < ApplicationController
user_id: current_user.try(:id), user_id: current_user.try(:id),
project_id: @project.id, project_id: @project.id,
issue_id: pull_issue.id, issue_id: pull_issue.id,
fork_project_id: _fork_project.id, fork_project_id: _fork_project&.id,
is_original: params[:is_original] is_original: params[:is_original]
} }
local_requests = PullRequest.new(@local_params.merge(pr_params)) local_requests = PullRequest.new(@local_params.merge(pr_params))
@ -77,7 +77,7 @@ class PullRequestsController < ApplicationController
if local_requests.is_original && params[:merge_user_login] if local_requests.is_original && params[:merge_user_login]
remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact
gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), _fork_project.owner, _fork_project.try(:identifier), remote_pr_params.except(:milestone)) gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), _fork_project&.owner, _fork_project.try(:identifier), remote_pr_params.except(:milestone))
else else
gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone))