Merge branch 'standalone_develop' into pm_project_develop

# Conflicts:
#	app/models/attachment.rb
#	app/views/api/v1/attachments/_simple_detail.json.jbuilder
This commit is contained in:
2024-04-29 09:11:08 +08:00
45 changed files with 344 additions and 52 deletions

View File

@@ -67,6 +67,7 @@ module ProjectsHelper
jianmu_devops_url: jianmu_devops_url,
cloud_ide_saas_url: cloud_ide_saas_url(user),
open_blockchain: Site.has_blockchain? && project.use_blockchain,
has_dataset: project.project_dataset.present?,
ignore_id: project.ignore_id
}).compact