Browse Source

Merge branch 'dev_trustie_server' into trustie_server

tags/v3.1.0
jasder 5 years ago
parent
commit
1c1be18151
2 changed files with 2 additions and 4 deletions
  1. +1
    -3
      app/services/repositories/migrate_service.rb
  2. +1
    -1
      app/views/repositories/detail.json.jbuilder

+ 1
- 3
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


+ 1
- 1
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?


Loading…
Cancel
Save