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

Merge branch 'dev_trustie' into dev_chain

Browse Source
This commit is contained in:
sylor_huang@126.com
2020-07-03 17:01:16 +08:00
parent 943d14ebfe 8f6b455a95
commit d812929152
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/pull_requests_controller.rb
View File

@@ -174,13 +174,14 @@ class PullRequestsController < ApplicationController
end
def show
@user_permission = current_user.present? && current_user.logged? && (@issue.assigned_to_id == current_user.id || @project.user_id == current_user.id || @project.manager?(current_user) )
@issue_user = @issue.user
@issue_assign_to = @issue.get_assign_user
end
def pr_merge
return render_forbidden("你没有权限操作.") if @project.reporter?(current_user)
if params[:do].blank?
normal_status(-1, "请选择合并方式")
else
@@ -191,7 +192,8 @@ class PullRequestsController < ApplicationController
MergeMessageField: params[:body],
MergeTitleField: params[:title]
}
merge_pr = Gitea::PullRequest::MergeService.new(current_user, @repository.try(:identifier), @pull_request.try(:gpid), requests_params).call
merge_pr = Gitea::PullRequest::MergeService.call(current_user.gitea_token, @repository.owner.login,
@repository.try(:identifier), @pull_request.try(:gpid), requests_params)
if @pull_request.update_attribute(:status, 1) && merge_pr[:status].to_i == 200
@pull_request&.project_trends&.update_all(action_type: "close")
@issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id)