anph
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,328 Commits 48 Branches 16 Tags 710 MiB
Commit Graph

118 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 a35db9fe80 新增：reviewers修改入口 2022-07-26 16:45:53 +08:00
yystopf 3f5754a3a5 新增：合并请求详情接口 2022-07-25 18:23:06 +08:00
yystopf a608803aa8 新增: 合并请求审查需审查权限 2022-06-30 11:00:18 +08:00
yystopf 50dc5cce5d fix 2022-05-07 14:06:48 +08:00
yystopf 000197b0d1 fix: issues and pull_request length calculate 2022-05-06 17:25:34 +08:00
yystopf 6aa3321d17 fix: pr title description validate 2022-05-06 14:29:05 +08:00
yystopf 088c617cc1 add: name query for branches 2022-04-26 17:15:59 +08:00
yystopf bc639488aa fix: issues filter error 2022-03-22 10:45:14 +08:00
yystopf e489c57fe8 fix: merge from develop 2022-03-10 11:07:14 +08:00
yystopf e120c4dac2 add: origin repository need open pr menu 2022-03-07 10:53:07 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 25d0e784bb fix: pr assignee info use array 2022-01-14 16:00:59 +08:00
yystopf b6b8befde7 fix: pr update must edit assignee login 2022-01-14 10:55:01 +08:00
yystopf 7849bd0ebf fix: remove pr permission 2021-12-21 10:16:29 +08:00
yystopf aa60de1dac fix: valid pr title length 2021-12-20 15:38:08 +08:00
yystopf 6f7899d16f fix: create pr authorize tip 2021-11-30 20:23:37 +08:00
yystopf 22f3371090 fix: change issues priority id default value 2021-11-29 11:05:33 +08:00
yystopf c0a4f8f4ec fix: create pull request need compare 2021-11-29 10:53:59 +08:00
yystopf 7586a0fb21 fix: change issue tag change size 2021-11-29 10:27:41 +08:00
yystopf abca0fe432 fix: change pr path id to number 2021-11-25 15:08:59 +08:00
yystopf d7612a0921 add: create update pr need authorize 2021-11-25 14:16:45 +08:00
yystopf be0f68cede fix 2021-11-25 11:19:50 +08:00
jasder 3e633ea6cc FIX 发送pr时，分支对比功能添加gitea 接口支持(pr_merge api) 2021-11-10 11:16:17 +08:00
yystopf 1a449d1dc6 add: atme service 2021-11-08 11:35:14 +08:00
yystopf 1b87a7a733 fix: send message job need open notice menu 2021-10-18 13:51:25 +08:00
yystopf 2a09fadf71 fix: change projec trend rule and fix data 2021-10-15 14:36:50 +08:00
yystopf ffa0715374 fix 2021-10-14 18:34:37 +08:00
yystopf 3d8b19fa73 fix: edit pr fork project info 2021-10-14 16:59:43 +08:00
yystopf 48b5117062 fix: check pr can merge change redirect url 2021-10-11 18:10:28 +08:00
yystopf 350502b499 fix: pullrequest create info 2021-10-11 10:07:35 +08:00
jasder 4f3dc2b627 Merge pull request '同步镜像项目增加重试机制，更新项目去掉一些验证，易修访问权限修复' (#160) from yystopf/forgeplus:hh_fix_bug into develop 2021-09-28 15:27:11 +08:00
yystopf 18b0c76082 fix 2021-09-17 14:15:38 +08:00
yystopf 41d04e9e99 fix: 标签改为标记 2021-09-16 18:39:19 +08:00
yystopf dbcbc01251 fix and add some message feature 2021-09-16 16:54:49 +08:00
yystopf 88bc5f29ff add: message touch condition 2021-09-15 18:55:58 +08:00
yystopf e9915cb654 add: change project menu authorize 2021-09-03 09:37:30 +08:00
yystopf c52458a7e3 add: require profile completed 2021-09-02 10:55:31 +08:00
yystopf 7d26fba3c0 add: pullrequest admin or developer 2021-08-26 17:56:19 +08:00
jasder 71e039efb8 FIX merge develop branch 2021-07-12 16:14:51 +08:00
viletyy fa8594d2ab add: merge pr check status 2021-07-12 12:02:34 +08:00
jasder 62d1a2378c FIX [更改字段名称]conflicts file for pull api 2021-06-25 17:31:23 +08:00
jasder 67e49a4f56 FIX 修复pulls、issues 搜索数量统计问题 2021-06-18 10:52:14 +08:00
vilet.yy 880f09a94a fix: change pulls navbar count 2021-06-16 11:10:26 +08:00
jasder 8a47761afb ADD mergeable column for get pull api 2021-05-21 11:39:50 +08:00
vilet.yy a9c0d18a5f add: gitea response process 2021-04-30 16:28:29 +08:00
jasder 0133ec24ca FIX pr merge bug 2021-04-29 18:48:54 +08:00
vilet.yy c14c92ac11 fix: pull_request permit develop create pr 2021-04-29 10:32:49 +08:00
vilet.yy ea42b0d6ed fix: pull_request can not select reporter and compare userinfo lose 2021-04-28 20:10:21 +08:00
vilet.yy 65d51e8578 add: project operate add organization team users 2021-04-28 15:15:45 +08:00