Browse Source

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

tags/v1.0.0
Jasder 5 years ago
parent
commit
480cfb66b1
2 changed files with 8 additions and 1 deletions
  1. +7
    -0
      app/controllers/pull_requests_controller.rb
  2. +1
    -1
      config/routes.rb

+ 7
- 0
app/controllers/pull_requests_controller.rb 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


+ 1
- 1
config/routes.rb View File

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


Loading…
Cancel
Save