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

Merge branch 'dev_trustie' into dev_devops

This commit is contained in:
sylor_huang@126.com 2020-08-15 13:27:32 +08:00
parent 0af359ec0c 0aa46815f2
commit 2154892a0b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/pull_requests_controller.rb
View File

@ -29,7 +29,7 @@ class PullRequestsController < ApplicationController
@projects_names = [{ @projects_names = [{
project_user_login: @user.try(:login), project_user_login: @user.try(:login),
project_name: "#{@user.try(:show_real_name)}/#{@repository.try(:identifier)}", project_name: "#{@user.try(:show_real_name)}/#{@repository.try(:identifier)}",
project_id: @project.id project_id: @project.identifier
}] }]
@merge_projects = @projects_names @merge_projects = @projects_names
fork_project = @project.fork_project if @is_fork fork_project = @project.fork_project if @is_fork
@ -37,7 +37,7 @@ class PullRequestsController < ApplicationController
@merge_projects.push({ @merge_projects.push({
project_user_login: fork_project.owner.try(:login), project_user_login: fork_project.owner.try(:login),
project_name: "#{fork_project.owner.try(:show_real_name)}/#{fork_project.repository.try(:identifier)}", project_name: "#{fork_project.owner.try(:show_real_name)}/#{fork_project.repository.try(:identifier)}",
project_id: fork_project.id project_id: fork_project.identifier
}) })
end end
end end