floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-16 17:55:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into standalone_develop

Browse Source 
# Conflicts:
#	app/models/pull_request.rb
This commit is contained in:
“xxq250”
2022-07-26 10:49:49 +08:00
parent db4e98ec37 5877474f59
commit 6f9db6b314
34 changed files with 655 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/pull_requests_controller.rb
View File

@@ -181,7 +181,7 @@ class PullRequestsController < ApplicationController
@issue_assign_to = @issue.get_assign_user
@gitea_pull = Gitea::PullRequest::GetService.call(@owner.login,
@repository.identifier, @pull_request.gitea_number, current_user&.gitea_token)
@last_review = @pull_request.issue.reviews.take
@last_review = @pull_request.reviews.take
end
def pr_merge