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_chain

This commit is contained in:
sylor_huang@126.com 2020-06-30 11:22:30 +08:00
parent e75b84544a 2adcd94f51
commit f6739a9502
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/repositories_controller.rb
View File

@ -132,8 +132,8 @@ class RepositoriesController < ApplicationController
@tags_count = Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier).call&.size @tags_count = Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier).call&.size
latest_commit = get_latest_commit latest_commit = get_latest_commit
@latest_commit = latest_commit[:body][0] @latest_commit = latest_commit[:body][0] if latest_commit.present?
@commits_count = latest_commit[:total_count] @commits_count = latest_commit[:total_count] if latest_commit.present?
end end
def get_ref def get_ref

2
app/helpers/projects_helper.rb
View File

@ -35,6 +35,7 @@ module ProjectsHelper
tmp_json = tmp_json.merge({ tmp_json = tmp_json.merge({
mirror_status: repo.mirror_status, mirror_status: repo.mirror_status,
mirror_num: repo.mirror_num, mirror_num: repo.mirror_num,
mirror_url: repo.mirror_url,
first_sync: repo.first_sync? first_sync: repo.first_sync?
}) })
end end
@ -43,6 +44,7 @@ module ProjectsHelper
identifier: project.identifier, identifier: project.identifier,
name: project.name, name: project.name,
id: project.id, id: project.id,
type: project.numerical_for_project_type,
author: { author: {
login: project.owner.login, login: project.owner.login,
name: project.owner.real_name, name: project.owner.real_name,