diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 1a31704b2..8f3df5546 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -58,7 +58,7 @@ class PullRequestsController < ApplicationController ActiveRecord::Base.transaction do @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params) if @gitea_pull_request[:status] == :success - @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"]) + @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"]) SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id) SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id) else diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb index 14b893556..ce0cb04ad 100644 --- a/app/models/pull_request.rb +++ b/app/models/pull_request.rb @@ -54,7 +54,7 @@ class PullRequest < ApplicationRecord Project.find_by(id: self.fork_project_id) end - def bind_gitea_pull_request!(gitea_pull_number, gitea_pull_id=gitea_pull_number) + def bind_gitea_pull_request!(gitea_pull_number, gitea_pull_id) update_columns( gitea_number: gitea_pull_number, gitea_id: gitea_pull_id)