Merge branch 'dev_devops' of http://git.trustie.net/jasder/forgeplus into dev_devops
This commit is contained in:
commit
480cfb66b1
|
@ -240,6 +240,13 @@ class PullRequestsController < ApplicationController
|
||||||
@user = @project.owner
|
@user = @project.owner
|
||||||
end
|
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
|
def find_pull_request
|
||||||
@pull_request = PullRequest.find_by_id(params[:id])
|
@pull_request = PullRequest.find_by_id(params[:id])
|
||||||
@issue = @pull_request&.issue
|
@issue = @pull_request&.issue
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
Rails.application.routes.draw do
|
Rails.application.routes.draw do
|
||||||
|
|
||||||
require 'sidekiq/web'
|
require 'sidekiq/web'
|
||||||
require 'admin_constraint'
|
require 'admin_constraint'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue