floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-16 01:35:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'pre_trustie_server' into trustie_server

Browse Source
This commit is contained in:
yystopf
2024-10-25 15:32:39 +08:00
parent 0d2ed00e4c 64ffab243c
commit ba20708514
21 changed files with 373 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/pull_requests_controller.rb
View File

@@ -296,11 +296,11 @@ class PullRequestsController < ApplicationController
private
def load_pull_request
@pull_request = @project.pull_requests.where(gitea_number: params[:id]).where.not(id: params[:id]).take || PullRequest.find_by_id(params[:id])
@pull_request = @project.pull_requests.where(gitea_number: params[:id]).where.not(id: params[:id]).take || @project.pull_requests.find_by_id(params[:id])
end
def find_pull_request
@pull_request = @project.pull_requests.where(gitea_number: params[:id]).where.not(id: params[:id]).take || PullRequest.find_by_id(params[:id])
@pull_request = @project.pull_requests.where(gitea_number: params[:id]).where.not(id: params[:id]).take || @project.pull_requests.find_by_id(params[:id])
@issue = @pull_request&.issue
if @pull_request.blank?
normal_status(-1, "合并请求不存在")