Change
This commit is contained in:
parent
5f3f6748f2
commit
e092c1f222
|
@ -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,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
|
||||||
|
|
Loading…
Reference in New Issue