forgeplus/app
xxq250 9065029d08 Merge branch 'master' into sponsor
# Conflicts:
#	.gitignore
#	Gemfile
#	Gemfile.lock
#	app/controllers/accounts_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/compare_controller.rb
#	app/controllers/journals_controller.rb
#	app/controllers/members_controller.rb
#	app/controllers/pull_requests_controller.rb
#	app/controllers/settings_controller.rb
#	app/controllers/users_controller.rb
#	app/controllers/version_releases_controller.rb
#	app/models/gitea/webhook_task.rb
#	app/models/message_template/pull_request_atme.rb
#	app/models/project.rb
#	app/models/project_category.rb
#	app/models/user_extension.rb
#	app/views/users/get_user_info.json.jbuilder
#	app/views/users/show.json.jbuilder
#	config/routes.rb
2023-01-12 17:33:18 +08:00
..
assets Merge branch 'master' into sponsor 2023-01-12 17:33:18 +08:00
channels FIX actioncable job 2020-07-07 16:08:10 +08:00
constraint qianyi datas 2020-07-09 16:46:57 +08:00
controllers Merge branch 'master' into sponsor 2023-01-12 17:33:18 +08:00
decorators FIX code review 2021-11-11 18:03:30 +08:00
docs/slate/source Merge branch 'develop' into standalone_develop 2022-09-29 13:59:04 +08:00
forms Merge branch 'develop' into standalone_develop 2022-09-06 14:58:02 +08:00
helpers Merge branch 'master' into sponsor 2023-01-12 17:33:18 +08:00
imports add: download and import user template xlsx 2022-05-16 16:59:25 +08:00
interactors 修复:提交文件内容格式由前端决定 2022-11-29 17:08:26 +08:00
jobs Merge branch 'master' into sponsor 2023-01-12 17:33:18 +08:00
libs fixed 错误对象 2022-12-02 15:17:57 +08:00
mailers fixed 区分找回密码邮件标题 2022-11-15 14:31:18 +08:00
models Merge branch 'master' into sponsor 2023-01-12 17:33:18 +08:00
queries fixed 项目列表增加私有组织中项目过滤 2022-12-28 09:32:53 +08:00
services fixed 创建仓库开通建木DevOps通知传递用户 2022-12-15 16:45:28 +08:00
tasks Fix admin project list 2020-07-22 17:21:59 +08:00
views Merge branch 'master' into sponsor 2023-01-12 17:33:18 +08:00