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 'standalone_develop' into pm_project_develop

Browse Source 
# Conflicts:
#	app/controllers/attachments_controller.rb
#	app/services/api/v1/issues/concerns/checkable.rb
#	app/services/api/v1/issues/concerns/loadable.rb
This commit is contained in:
xxq250
2023-12-15 10:43:54 +08:00
parent 39aa02ff57 d98ad8a3f4
commit 7d1b4da72c
26 changed files with 130 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/api/v1/issues/show_by_id.json.jbuilder Normal file
View File

@@ -0,0 +1,2 @@
json.partial! "api/v1/issues/detail", locals: {issue: @issue}
json.user_permission @user_permission

6
app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder
View File

@@ -4,7 +4,11 @@ if tag.present? && tag.is_a?(Hash)
json.zipball_url render_zip_url(@owner, @repository, tag['name'])
json.tarball_url render_tar_url(@owner, @repository, tag['name'])
json.tagger do
json.partial! 'api/v1/users/commit_user', user: render_cache_commit_author(tag['tagger']), name: tag['tagger']['name']
if tag['tagger'].present?
json.partial! 'api/v1/users/commit_user', user: render_cache_commit_author(tag['tagger']), name: tag['tagger']['name']
else
json.nil!
end
end
json.time_ago time_from_now(tag['tagger']['date'].to_time)
json.created_at_unix tag['tagger']['date'].to_time.to_i

1
app/views/api/v1/projects/tags/show.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "api/v1/projects/tags/simple_gitea_index_detail", tag: @result_object