forgeplus/app/models/gitea
xxq250 fc4db3bb9a Merge branch 'dev_nanda' of https://gitlink.org.cn/Gitlink/forgeplus
# Conflicts:
#	app/controllers/application_controller.rb
#	app/controllers/pull_requests_controller.rb
#	app/controllers/users_controller.rb
#	app/models/ci/user.rb
#	app/models/gitea/pull.rb
#	app/models/gitea/webhook.rb
#	app/models/gitea/webhook_task.rb
#	app/models/organization.rb
#	app/models/project.rb
#	app/models/project_category.rb
#	app/models/user.rb
#	app/services/projects/create_service.rb
2023-01-12 17:51:48 +08:00
..
base.rb FIX [bug]conflicts file for pull api 2021-06-24 16:18:34 +08:00
public_key.rb model schema information changed 2022-05-12 09:14:25 +08:00
pull.rb Merge branch 'master' into sponsor 2023-01-12 17:33:18 +08:00
webhook.rb Merge branch 'dev_nanda' of https://gitlink.org.cn/Gitlink/forgeplus 2023-01-12 17:51:48 +08:00
webhook_task.rb Merge branch 'master' into sponsor 2023-01-12 17:33:18 +08:00