forgeplus/app/models/gitea
xxq250 b760d17988 Merge branch 'standalone_develop' into dev_osredm_server
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/admins/users_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/owners_controller.rb
#	app/helpers/application_helper.rb
#	app/helpers/avatar_helper.rb
#	app/models/edu_setting.rb
#	app/models/user.rb
#	app/models/user_action.rb
#	app/views/layouts/admin.html.erb
#	app/views/projects/index.json.jbuilder
#	config/harmonious_dictionary/chinese_dictionary.txt
#	config/harmonious_dictionary/harmonious.hash
#	config/harmonious_dictionary/harmonious_english.yml
#	config/routes/api.rb
2025-03-20 14:32:54 +08:00
..
action_run.rb 新增: 流水线改版接口 2025-01-22 16:50:42 +08:00
base.rb FIX [bug]conflicts file for pull api 2021-06-24 16:18:34 +08:00
public_key.rb cla init 2023-06-13 15:30:16 +08:00
pull.rb 合并主干所有代码 2024-05-20 14:35:33 +08:00
repo_unit.rb 流水线启用状态,流水线设计时 id 2025-03-17 10:16:40 +08:00
webhook.rb 合并主干所有代码 2024-05-20 14:35:33 +08:00
webhook_task.rb 合并主干所有代码 2024-05-20 14:35:33 +08:00