“xxq250” cb302b50dd Merge branch 'develop' into dev_jk_server ... # Conflicts: # app/assets/javascripts/admin.js # app/controllers/accounts_controller.rb # app/controllers/application_controller.rb # app/controllers/attachments_controller.rb # app/controllers/concerns/login_helper.rb # app/controllers/concerns/register_helper.rb # app/controllers/concerns/render_helper.rb # app/controllers/concerns/repository/languages_percentagable.rb # app/controllers/repositories_controller.rb # app/controllers/users/is_pinned_projects_controller.rb # app/controllers/users_controller.rb # app/docs/slate/source/api.html.md # app/docs/slate/source/includes/_projects.md # app/docs/slate/source/includes/_pulls.md # app/docs/slate/source/includes/_repositories.md # app/docs/slate/source/includes/_teams.md # app/docs/slate/source/includes/_users.md # app/helpers/application_helper.rb # app/imports/admins/new_import_user_from_excel.rb # app/libs/custom_regexp.rb # app/models/journal.rb # app/models/project.rb # app/models/user.rb # app/queries/admins/user_query.rb # app/services/admins/import_user_from_excel_service.rb # app/views/admins/users/index.html.erb # app/views/members/index.json.jbuilder # app/views/settings/show.json.jbuilder # config/routes.rb # public/导入用户模板.xlsx		2022-09-27 15:32:46 +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	add: project operate add organization team users	2021-04-28 15:15:45 +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	新增：reviewers修改入口	2022-07-26 16:45:53 +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 'develop' into dev_jk_server	2022-09-27 15:32:46 +08:00
new.json.jbuilder	Change	2020-08-15 13:49:36 +08:00
show.json.jbuilder	新增：reviewers修改入口	2022-07-26 16:45:53 +08:00