From 2ecb227c30fca913672d9125237b08d4ea5a0f3d Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 3 Jul 2020 17:14:20 +0800 Subject: [PATCH] change error --- app/controllers/pull_requests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index f17382c2d..f5b27526a 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -192,7 +192,7 @@ class PullRequestsController < ApplicationController MergeMessageField: params[:body], MergeTitleField: params[:title] } - merge_pr = Gitea::PullRequest::MergeService.call(current_user.gitea_token, @repository.owner.login, + merge_pr = Gitea::PullRequest::MergeService.call(current_user.gitea_token, @project.owner.login, @repository.try(:identifier), @pull_request.try(:gpid), requests_params) if @pull_request.update_attribute(:status, 1) && merge_pr[:status].to_i == 200 @pull_request&.project_trends&.update_all(action_type: "close")