Merge branch 'dev_devops' of http://git.trustie.net/jasder/forgeplus into dev_devops

This commit is contained in:
Jasder 2020-08-15 19:57:35 +08:00
commit 480cfb66b1
2 changed files with 8 additions and 1 deletions

View File

@ -240,6 +240,13 @@ class PullRequestsController < ApplicationController
@user = @project.owner
end
def set_repository
@repository = @project.repository
@user = @project.owner
normal_status(-1, "仓库不存在") unless @repository.present?
normal_status(-1, "用户不存在") unless @user.present?
end
def find_pull_request
@pull_request = PullRequest.find_by_id(params[:id])
@issue = @pull_request&.issue

View File

@ -1,5 +1,5 @@
Rails.application.routes.draw do
require 'sidekiq/web'
require 'admin_constraint'