forgeplus/app/controllers/concerns
“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
..
admins init project 2020-03-09 00:40:16 +08:00
api 新增:新合并请求列表接口 2022-07-25 16:21:03 +08:00
base 分页大小改为10行 2022-06-27 11:15:07 +08:00
ci 修复 devops无法激活项目的问题 2022-05-27 10:48:20 +08:00
cooperative init project 2020-03-09 00:40:16 +08:00
repository Merge branch 'develop' into dev_jk_server 2022-09-27 15:32:46 +08:00
acceleratorable.rb 修复: gitea module命名重复问题 2022-06-23 11:33:11 +08:00
code_example.rb init project 2020-03-09 00:40:16 +08:00
controller_rescue_handler.rb FIX code review 2021-11-11 18:03:30 +08:00
git_common.rb FIX code review 2021-11-11 18:03:30 +08:00
git_helper.rb FIX code review 2021-11-11 18:03:30 +08:00
laboratory_helper.rb current_main_site_url 2022-06-01 10:53:24 +08:00
logger_helper.rb init project 2020-03-09 00:40:16 +08:00
login_helper.rb fixed 同步gitea密码状态is_sync_pwd更新 2022-07-06 15:26:49 +08:00
operate_project_ability_able.rb FIX repositories controller bug 2020-08-12 14:51:12 +08:00
paginate_helper.rb [ADD]组织项目相关 2021-02-06 14:27:47 +08:00
register_helper.rb Merge branch 'develop' into dev_jk_server 2022-09-27 15:32:46 +08:00
render_expand.rb init project 2020-03-09 00:40:16 +08:00
render_helper.rb fixed 返回状态码 2022-09-08 14:22:22 +08:00