Browse Source

cahnge

tags/v1.0.0
sylor_huang@126.com 5 years ago
parent
commit
fae9df56a4
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      app/controllers/pull_requests_controller.rb

+ 2
- 2
app/controllers/pull_requests_controller.rb View File

@@ -68,7 +68,7 @@ class PullRequestsController < ApplicationController
user_id: current_user.try(:id),
project_id: @project.id,
issue_id: pull_issue.id,
fork_project_id: _fork_project.id,
fork_project_id: _fork_project&.id,
is_original: params[:is_original]
}
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]
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
gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone))



Loading…
Cancel
Save