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

Merge branch 'develop' into dev_trustie_server

Browse Source
This commit is contained in:
jasder
2021-05-10 14:38:58 +08:00
parent 3e3fd46cad 3c61848a77
commit e5f591e509
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/repositories/migrate_service.rb
View File

@@ -21,9 +21,7 @@ class Repositories::MigrateService < ApplicationService
private
def repository_params
params.merge(project_id: project.id,
identifier: params[:identifier],
source_clone_url: params[:source_clone_url])
params.merge(project_id: project.id)
end
def gitea_repository_params

2
app/views/repositories/detail.json.jbuilder
View File

@@ -21,7 +21,7 @@ json.versions_count @project.versions_count #里程碑数量
json.version_releases_count @project.releases_size(@user.try(:id), "all")
json.version_releasesed_count @project.releases_size(@user.try(:id), "released") #已发行的版本
json.permission render_permission(@user, @project)
json.mirror_url @project&.repository.source_clone_url
json.mirror_url @project&.repository.remote_mirror_url
json.mirror @project&.repository.mirror_url.present?
json.type @project.numerical_for_project_type
json.open_devops @project.open_devops?