floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-24 13:45:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_trustie' into dev_devops

Browse Source
This commit is contained in:
sylor_huang@126.com
2020-08-15 13:49:52 +08:00
parent a7b096d00e e092c1f222
commit 372687e509
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/pull_requests_controller.rb
View File

@@ -29,7 +29,8 @@ 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.identifier project_id: @project.identifier,
id: @project.id
}] }]
@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 +38,8 @@ 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.identifier project_id: fork_project.identifier,
id: fork_project.id
}) })
end end
end end

1
app/views/pull_requests/new.json.jbuilder
View File

@@ -1,5 +1,6 @@
json.partial! "commons/success" json.partial! "commons/success"
json.project_id @project.identifier json.project_id @project.identifier
json.id @project.id
json.branches @all_branches json.branches @all_branches
json.is_fork @is_fork json.is_fork @is_fork
json.projects_names @projects_names json.projects_names @projects_names