Browse Source

add: origin repository need open pr menu

pull/313/head
yystopf 4 years ago
parent
commit
e120c4dac2
2 changed files with 2 additions and 1 deletions
  1. +1
    -0
      app/controllers/compare_controller.rb
  2. +1
    -1
      app/controllers/pull_requests_controller.rb

+ 1
- 0
app/controllers/compare_controller.rb View File

@@ -16,6 +16,7 @@ class CompareController < ApplicationController
if @base.blank? || @head.blank?
return -2, "请选择分支"
else
return -2, "目标仓库未开启合并请求(PR)功能" unless @project.has_menu_permission("pulls")
if @head.include?(":")
fork_project = @project.forked_projects.joins(:owner).where(users: {login: @head.to_s.split("/")[0]}).take
return -2, "请选择正确的仓库" unless fork_project.present?


+ 1
- 1
app/controllers/pull_requests_controller.rb View File

@@ -2,7 +2,7 @@ class PullRequestsController < ApplicationController
before_action :require_login, except: [:index, :show, :files, :commits]
before_action :require_profile_completed, only: [:create]
before_action :load_repository
before_action :check_menu_authorize
before_action :check_menu_authorize, only: [:index, :show, :create, :update, :refuse_merge, :pr_merge]
before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos, :files, :commits]
before_action :load_pull_request, only: [:files, :commits]
before_action :find_atme_receivers, only: [:create, :update]


Loading…
Cancel
Save