Commit Graph

183 Commits

Author SHA1 Message Date
“xxq250” 321f367e3e Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-07-28 16:46:27 +08:00
“xxq250” 4ccf8ea5ff CloudIDEA文件标记已读未读 2022-07-28 16:42:21 +08:00
yystopf 445ae6fbc3 merge from develop 2022-07-27 16:12:12 +08:00
yystopf d6b5dc326a 新增: 评论相关api根据需求重写 2022-07-27 14:52:49 +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
“xxq250” 5877474f59 Merge remote-tracking branch 'origin/develop' into develop 2022-07-26 10:44:21 +08:00
“xxq250” 1bbde165c2 reposyncer同步仓库接口 2022-07-26 10:44:12 +08:00
yystopf 1feb166fd5 修复:合并请求评审模型修改 2022-07-25 16:20:42 +08:00
xiaoxiaoqiong ed0655452c 增加从webhook接收仓库日志记录 2022-07-18 09:34:56 +08:00
xiaoxiaoqiong e919b03e90 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-07-11 15:52:57 +08:00
xiaoxiaoqiong 4fa1a433fa 增加从webhook接收仓库日志记录 2022-07-11 15:52:38 +08:00
yystopf f8b63ff02e merge from develop 2022-07-07 13:47:47 +08:00
yystopf 76cc185a1d 新增: 合并请求审核model 2022-06-29 17:16:29 +08:00
yystopf 79cbeb846b Merge branch 'develop' into standalone_develop 2022-06-20 13:05:35 +08:00
yystopf 531495429c 修复: 无法正常更改token长度的问题 2022-06-20 13:05:25 +08:00
yystopf e75f5f655f Merge branch 'develop' into standalone_develop 2022-06-20 10:34:32 +08:00
yystopf bed2469014 fix: change error 2022-06-20 10:34:25 +08:00
yystopf 7e5d5e31e5 merge from develop 2022-06-20 10:21:10 +08:00
yystopf 1ebb6cb561 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-06-20 09:34:29 +08:00
yystopf 21ccedab9c 修复: doorkeeper 无法生成jwt token 2022-06-17 18:33:37 +08:00
xiaoxiaoqiong 1f9caeece5 auth2接入 2022-06-17 17:02:24 +08:00
yystopf c42f3d5928 新增:邀请用户链接生成 2022-06-17 14:06:59 +08:00
yystopf 94881dd72a add: user trace tasks record 2022-05-13 14:31:59 +08:00
yystopf 0e4c0a46c2 fix 2022-05-13 13:56:12 +08:00
yystopf 7750cbe272 add: project trace tasks count 2022-05-12 09:43:55 +08:00
yystopf 1f13bba52e add: trace user tasks_count 2022-05-12 09:43:55 +08:00
yystopf 20af4a7d82 Merge branch 'develop' into standalone_develop 2022-05-06 17:25:52 +08:00
yystopf 000197b0d1 fix: issues and pull_request length calculate 2022-05-06 17:25:34 +08:00
yystopf 11724bf63f Merge branch 'develop' into standalone_develop 2022-04-28 11:04:01 +08:00
yystopf ec3a556a6f fix: default value for show super description 2022-04-28 11:03:42 +08:00
yystopf 1d7c7eba24 Merge branch 'develop' into standalone_develop 2022-04-28 10:54:02 +08:00
yystopf 396ac55429 add: user super description 2022-04-28 10:42:55 +08:00
yystopf b25db9d37f fix: merge from develop 2022-03-31 13:00:36 +08:00
yystopf 4bbb843edf add: trace users and get trace token 2022-03-31 12:54:39 +08:00
yystopf 96b0f2d167 Merge branch 'develop' into standalone_develop 2021-12-28 16:10:16 +08:00
yystopf 8e79b43aaf add: member bind team user 2021-12-22 11:16:27 +08:00
xiaoxiaoqiong ba9e74f373 fixed db:migrate 2021-12-08 15:32:28 +08:00
xxq250 93dd5b5d84 Merge pull request '易修声明功能' (#284) from starlee/forgeplus:lzx-claim-2.0 into standalone_develop 2021-12-08 15:12:15 +08:00
xiaoxiaoqiong b22c65e5c2 Merge branch 'develop' into standalone_develop 2021-12-01 17:21:23 +08:00
xiaoxiaoqiong 922561afb1 项目精选加索引 2021-12-01 17:20:52 +08:00
yystopf 6ffc702209 Merge pull request '提交最新代码到预上线环境' (#272) from develop into standalone_develop 2021-11-29 15:44:51 +08:00
yystopf 22f3371090 fix: change issues priority id default value 2021-11-29 11:05:33 +08:00
starlee e25e2fdd77 add the claim mechanism 2021-11-25 13:33:32 +08:00
jasder e3588291b2 Merge pull request '首页api数据以及后台管理' (#240) from yystopf/forgeplus:hh_home_index into featrue_homepage 2021-11-08 14:35:19 +08:00
yystopf 35f04afe91 add: home index admins 2021-11-02 19:00:07 +08:00
yystopf 94075717e2 add: home index models 2021-11-02 15:56:47 +08:00
jasder 6c67b92bb1 FIX revert system_notification_histories 2021-11-01 11:06:18 +08:00
yystopf 8698829678 fix: organization recommend api 2021-10-28 15:28:33 +08:00
yystopf a43f6714de add: project explore api 2021-10-27 14:20:27 +08:00
yystopf d54dcb6b67 add: template message settings api 2021-10-19 14:40:21 +08:00