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
..
_commit.json.jbuilder	fix: complete profile condition	2021-12-24 16:15:59 +08:00
_detail.json.jbuilder	新增：reviewers修改入口	2022-07-26 16:45:53 +08:00
_diff_file.json.jbuilder	ADD sha column ro pull request's files compare api	2020-11-06 22:03:12 +08:00
_merge_item.json.jbuilder	禁止pr访问标识	2023-06-07 11:45:50 +08:00
commits.json.jbuilder	ADD some api	2020-11-03 18:37:47 +08:00
create.json.jbuilder	fix: pullrequest create info	2021-10-11 10:07:35 +08:00
create_merge_infos.json.jbuilder	change pull-request	2020-06-29 17:06:46 +08:00
edit.json.jbuilder	新增：合并请求编辑返回关联issue数据	2023-03-10 14:49:20 +08:00
files.json.jbuilder	FIX render json builder partil performance for pull some api	2021-01-12 15:55:11 +08:00
index.json.jbuilder	Merge branch 'standalone_develop' into dev_osredm_server	2025-03-20 14:32:54 +08:00
new.json.jbuilder	Change	2020-08-15 13:49:36 +08:00
show.json.jbuilder	fixed 删除用户图标	2024-10-11 15:01:32 +08:00