floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX pull_requests new action bug

This commit is contained in:
Jasder 2020-08-12 15:03:23 +08:00
parent 082c3b05b3
commit 0e951df5d0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/pull_requests_controller.rb
View File

@ -1,6 +1,7 @@
class PullRequestsController < ApplicationController class PullRequestsController < ApplicationController
before_action :require_login, except: [:index, :show] before_action :require_login, except: [:index, :show]
before_action :load_repository before_action :load_repository
before_action :set_user, only: [:new, :get_branches]
before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos] before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos]
# before_action :get_relatived, only: [:edit] # before_action :get_relatived, only: [:edit]
include TagChosenHelper include TagChosenHelper
@ -233,6 +234,10 @@ class PullRequestsController < ApplicationController
private private
def set_user
@user = @project.owner
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