KingChan
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,828 Commits 67 Branches 0 Tags 728 MiB
Commit Graph

152 Commits

Author SHA1 Message Date
yystopf ebf1c1d31b Merge branch 'standalone_develop' into dev_osredm_server 2025-09-04 11:32:49 +08:00
yystopf 6a8ef3ac3b 新增：触发项目行为构建 2025-08-27 16:04:08 +08:00
xxq250 b760d17988 Merge branch 'standalone_develop' into dev_osredm_server 
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/admins/users_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/owners_controller.rb
#	app/helpers/application_helper.rb
#	app/helpers/avatar_helper.rb
#	app/models/edu_setting.rb
#	app/models/user.rb
#	app/models/user_action.rb
#	app/views/layouts/admin.html.erb
#	app/views/projects/index.json.jbuilder
#	config/harmonious_dictionary/chinese_dictionary.txt
#	config/harmonious_dictionary/harmonious.hash
#	config/harmonious_dictionary/harmonious_english.yml
#	config/routes/api.rb
 2025-03-20 14:32:54 +08:00
yystopf a434fc59f5 更改：根据id查询issue pr缩小范围 2024-10-15 14:04:07 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
yystopf 62ff6dd1d7 Merge branch 'develop' into standalone_develop 2024-03-16 16:03:43 +08:00
yystopf a0f1679f03 新增：合并请求合并接口冲突文件提示 2024-03-16 16:03:31 +08:00
chenjing d5807c0df0 cla send issue journal 2023-06-16 10:19:38 +08:00
xxqfamous 3456ddf526 PR数据访问权限控制 2023-05-30 15:10:02 +08:00
xxqfamous 712fe34c12 PR数据访问权限控制 2023-05-30 14:46:15 +08:00
yystopf 9b7cee7a05 Merge branch 'develop' into standalone_develop 2023-04-11 13:42:18 +08:00
yystopf d59e99feca 修复：合并请求更新失败 2023-04-11 10:12:24 +08:00
yystopf 96c32c072a Merge branch 'develop' into standalone_develop 2023-03-30 14:27:55 +08:00
yystopf 67fb6fce94 修复：读取仓库数据使用拥有者token 2023-03-27 14:16:06 +08:00
yystopf 92c4f87d5b 新增：关闭关联疑修新增操作记录 2023-03-10 14:49:20 +08:00
yystopf 8f680fd7c3 修复 2023-03-10 14:49:20 +08:00
yystopf 6c71994e33 更改：悬赏金额变更需要同步至链上以及关联疑修新增标记是否解决 2023-03-10 14:49:20 +08:00
yystopf d240797c25 新增：疑修悬赏金额验证 2023-03-10 14:49:20 +08:00
yystopf 3e0df7c1b9 新增：上链需要项目开启区块链机制 2023-03-10 14:48:53 +08:00
yystopf c9c16aef8d 新增：新版疑修上链操作 2023-03-10 14:48:53 +08:00
yystopf 18156ffd8d 新增：合并请求关联疑修逻辑 2023-03-10 14:48:53 +08:00
xxq250 b1c10d66f9 区块链确权相关 2023-03-02 13:49:50 +08:00
yystopf ccec8e9819 Merge branch 'develop' into dev_jk_server 2022-12-12 16:17:22 +08:00
yystopf 6e46b683e1 Merge branch 'develop' into standalone_develop 2022-11-11 14:13:56 +08:00
yystopf 49abadfa3f 新增：合并请求合并之后挂载的issue设置为关闭 2022-11-11 14:13:38 +08:00
yystopf 4a7dcf8a91 Merge branch 'develop' into standalone_develop 2022-11-11 11:50:26 +08:00
yystopf 30572aa41c 修复：重复代码移除 2022-11-11 11:11:34 +08:00
viletyy 2da84146eb Merge branch 'develop' into standalone_develop 2022-10-21 14:32:03 +08:00
viletyy 2bf84c0d5e merge from develop 2022-10-18 13:53:31 +08:00
yystopf 58a43a8b80 更改：合并请求和issue仅加载开启中的里程碑 2022-10-18 13:43:16 +08:00
“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 445ae6fbc3 merge from develop 2022-07-27 16:12:12 +08:00
yystopf a35db9fe80 新增：reviewers修改入口 2022-07-26 16:45:53 +08:00
“xxq250” 6f9db6b314 Merge remote-tracking branch 'origin/develop' into standalone_develop 
# Conflicts:
#	app/models/pull_request.rb
 2022-07-26 10:49:49 +08:00
yystopf 3f5754a3a5 新增：合并请求详情接口 2022-07-25 18:23:06 +08:00
yystopf f8b63ff02e merge from develop 2022-07-07 13:47:47 +08:00
yystopf a608803aa8 新增: 合并请求审查需审查权限 2022-06-30 11:00:18 +08:00
xiaoxiaoqiong bf2e6269f9 fixed 仓库报告者角色 可以走接口新建合并请求成功#61489 2022-06-28 11:05:12 +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