Commit Graph

12 Commits

Author SHA1 Message Date
“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
yystopf a438ab6f3e 新增:提示语locale配置 2022-09-06 14:57:54 +08:00
yystopf 4878d66620 修复 2022-09-06 09:04:46 +08:00
yystopf 632ade9d25 修复 2022-09-06 09:02:30 +08:00
yystopf 5acd45bf85 修复 2022-09-06 09:00:05 +08:00
yystopf d03b45eecf 新增:创建文件对分支长度进行验证 2022-09-06 08:59:24 +08:00
jasder 4fe3f88de6 FIX 版本库在线创建文件去掉敏感词过滤功能 2021-11-10 10:20:19 +08:00
sylor_huang@126.com c9a263e03c Add Dun Check For Project 2020-08-18 10:36:13 +08:00
sylor_huang@126.com d87f44e939 工单的批量修改/删除的接口 2020-05-27 18:25:32 +08:00
sylor_huang@126.com e15a81a04c 修改create_file 2020-03-26 16:50:31 +08:00
Jasder 3e2b417cce FIX update repositories api 2020-03-20 20:15:43 +08:00
Jasder 2937b2a94d init project 2020-03-09 00:40:16 +08:00