“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
..
controllers	ADD 后台系统配置管理功能	2021-09-10 15:29:08 +08:00
helpers	ADD protected branch Features	2020-12-03 15:24:40 +08:00
jobs	init project	2020-03-09 00:40:16 +08:00
lib/tasks	ADD sync trustie data	2020-03-19 17:17:27 +08:00
mailers	init project	2020-03-09 00:40:16 +08:00
models	Merge branch 'develop' into dev_jk_server	2022-09-27 15:32:46 +08:00
requests	init project	2020-03-09 00:40:16 +08:00
routing	init project	2020-03-09 00:40:16 +08:00
views	merge from develop	2022-01-18 15:30:57 +08:00
helpers.rb	init project	2020-03-09 00:40:16 +08:00
rails_helper.rb	init project	2020-03-09 00:40:16 +08:00
spec_helper.rb	init project	2020-03-09 00:40:16 +08:00