forgeplus/app/forms
“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
..
ci Test Project Validate Failed12 2020-08-24 14:17:23 +08:00
contents Merge branch 'develop' into dev_jk_server 2022-09-27 15:32:46 +08:00
gitea add: new update user info simple and sync gitea 2022-05-24 10:59:52 +08:00
issues add: issues description and journals notes validate 2022-05-06 09:56:22 +08:00
journals add: issues description and journals notes validate 2022-05-06 09:56:22 +08:00
libraries init project 2020-03-09 00:40:16 +08:00
notice/write add: notice system api 2021-09-13 17:51:34 +08:00
organizations fix: org update error 2021-12-20 15:38:08 +08:00
project_packages init project 2020-03-09 00:40:16 +08:00
projects Merge branch 'develop' into dev_jk_server 2022-09-27 15:32:46 +08:00
protected_branches ADD protected branch Features 2020-12-03 15:24:40 +08:00
register Merge branch 'develop' into dev_jk_server 2022-09-27 15:32:46 +08:00
repositories init project 2020-03-09 00:40:16 +08:00
users 密码长度20 2022-04-02 10:29:58 +08:00
validate init project 2020-03-09 00:40:16 +08:00
base_form.rb 密码长度20 2022-04-02 10:27:29 +08:00
oauth_educoder_form.rb Delete mail validate for bind action 2020-08-18 09:07:16 +08:00