floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
3,955 Commits 7 Branches 16 Tags 707 MiB
Commit Graph

3247 Commits

Author SHA1 Message Date
yystopf 423d5a9316 修复：同步项目权限到组织时需预先判断是否存在于团队中 2022-11-01 15:29:07 +08:00
viletyy 2548b0e9c0 Merge branch 'develop' into standalone_develop 2022-10-27 17:58:27 +08:00
yystopf 9664ca001e 新增: 邮箱验证码重新发送后之前的验证码需设置为无效 2022-10-27 17:57:55 +08:00
viletyy d665d0edb1 Merge branch 'develop' into standalone_develop 2022-10-27 10:49:05 +08:00
yystopf e15809c186 修复：无法正常转移的问题 2022-10-27 10:48:24 +08:00
viletyy 4235c3ee63 Merge branch 'develop' into standalone_develop 2022-10-27 09:56:14 +08:00
yystopf 7d4c0df691 修复 2022-10-27 09:55:55 +08:00
viletyy 761c311a88 Merge branch 'develop' into standalone_develop 2022-10-27 09:30:09 +08:00
yystopf e72dfa4973 修复：项目迁移设置权限在更改拥有者之后 2022-10-27 09:28:52 +08:00
viletyy 893f6c04a5 Merge branch 'develop' into standalone_develop 2022-10-26 14:58:25 +08:00
yystopf 3d5b2e76d7 修复：update_column无法触发count_cache 2022-10-26 14:58:04 +08:00
viletyy 6e9962e0da Merge branch 'develop' into standalone_develop 2022-10-26 14:50:23 +08:00
yystopf 8b14ee3c72 修复：更改组织下项目权限同时更改组织下权限同步至gitea 2022-10-26 14:49:40 +08:00
“xxq250” a4c892ec0a fixed cloudIDE saas定制api 2022-10-25 11:19:59 +08:00
“xxq250” 2945570a51 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-10-21 17:44:06 +08:00
“xxq250” 969cbcfe60 fixed users/me返回email,用于三方登录 2022-10-21 17:44:02 +08:00
viletyy 4d61127e49 Merge branch 'develop' into standalone_develop 2022-10-21 15:29:20 +08:00
yystopf 3f7366fbcd 修复：更改用户通知邮箱只能自己改自己的 2022-10-21 15:28:48 +08:00
viletyy 97a661cd95 Merge branch 'develop' into standalone_develop 2022-10-21 15:07:48 +08:00
yystopf cfdbc5a682 修复 2022-10-21 15:07:31 +08:00
viletyy f557994f8a Merge branch 'develop' into standalone_develop 2022-10-21 15:04:52 +08:00
yystopf 9b880e3209 修复 2022-10-21 15:04:26 +08:00
viletyy 04642497df Merge branch 'develop' into standalone_develop 2022-10-21 14:43:08 +08:00
yystopf c2ef23b746 修复 2022-10-21 14:42:51 +08:00
viletyy 292167b47e Merge branch 'develop' into standalone_develop 2022-10-21 14:41:09 +08:00
yystopf 8a33ea6707 修复 2022-10-21 14:40:43 +08:00
viletyy 2da84146eb Merge branch 'develop' into standalone_develop 2022-10-21 14:32:03 +08:00
yystopf 9ee4c85b7c 更改：验证返回status以及万能验证码 2022-10-21 14:31:32 +08:00
“xxq250” 4cc4ed5864 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-10-21 09:42:27 +08:00
“xxq250” 0a5dd2f1ee ssh公钥允许token请求 2022-10-21 09:42:21 +08:00
yystopf e9b23d6577 更改：合并请求代码冲突提示语更改 2022-10-19 16:17:44 +08:00
yystopf 64d9c334ce 修复：项目语言验证信息统一 2022-10-19 15:18:15 +08:00
yystopf cad7e24299 修复：项目列表表头样式 2022-10-18 15:53:37 +08:00
yystopf 3b15dd84fc 新增：标签列表返回总数 2022-10-18 14:52:15 +08:00
yystopf 58a43a8b80 更改：合并请求和issue仅加载开启中的里程碑 2022-10-18 13:43:16 +08:00
yystopf e25231738a 新增：标签名字列表 2022-10-18 13:32:57 +08:00
yystopf 35965f542a 新增：标签名字列表 2022-10-18 13:31:12 +08:00
yystopf fa48e3f5ca 修复：许可证和忽略文件内容为空表单提示 2022-10-18 11:14:35 +08:00
yystopf 13e2738fb5 新增：列表页新增only_watched参数 2022-10-17 17:37:03 +08:00
viletyy a494a905fa Merge branch 'develop' into standalone_develop 2022-10-17 13:16:49 +08:00
yystopf 30437d828c 新增：项目git忽略文件新增验证 2022-10-17 13:16:22 +08:00
yystopf dcc7ab6738 更改：项目分类去掉图片上传 2022-10-17 13:01:08 +08:00
yystopf 5196f33f24 新增：项目许可证新增验证 2022-10-17 12:57:24 +08:00
yystopf 8807be6e4d 新增：项目语言新增唯一性验证 2022-10-17 10:52:57 +08:00
yystopf 8d41c27044 更改：项目成员添加提示 2022-10-17 10:42:40 +08:00
viletyy 77ec7e5a69 Merge branch 'develop' into standalone_develop 2022-10-17 10:25:47 +08:00
yystopf 53fe554d1e 更改：后台管理表头样式 2022-10-17 10:25:17 +08:00
“xxq250” 4e02dbe06b Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	app/controllers/attachments_controller.rb
 2022-10-17 10:14:13 +08:00
“xxq250” 620ddff9bb fixed issue评论附件权限 2022-10-17 10:13:30 +08:00
viletyy 732d1a1adb Merge branch 'develop' into standalone_develop 2022-10-15 11:29:58 +08:00
yystopf 630a7aadeb 新增：组织数据修复任务 2022-10-15 11:29:23 +08:00
viletyy 2cdcd5f117 Merge branch 'develop' into standalone_develop 2022-10-14 15:31:39 +08:00
yystopf 6383384287 更改：后台管理用户真实姓名改为昵称 2022-10-14 15:31:20 +08:00
viletyy 6b6c0791cd Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-10-14 15:02:59 +08:00
viletyy 2df259c927 Merge branch 'develop' into standalone_develop 2022-10-14 15:02:53 +08:00
yystopf 83f1263f85 修复：更改查询项目判断条件 2022-10-14 14:52:25 +08:00
“xxq250” 4b0609931a 更换发送邮箱 2022-10-14 11:59:48 +08:00
“xxq250” c2742f0ae7 cloudIDE saas定制api 2022-10-12 16:46:15 +08:00
“xxq250” 483c8d5410 cloudIDE saas定制api 2022-10-12 16:42:45 +08:00
“xxq250” c2673bd48d cloudIDE saas定制api 2022-10-12 16:37:54 +08:00
“xxq250” f031cd4720 cloudIDE saas定制api 2022-10-12 16:34:44 +08:00
“xxq250” bf1e722084 cloudIDE saas定制api 2022-10-12 16:04:27 +08:00
“xxq250” 8b1f06f010 cloudIDE saas定制api 2022-10-12 15:58:46 +08:00
“xxq250” 6d2a6e0331 cloudIDE saas定制api 2022-10-12 15:44:46 +08:00
“xxq250” c668fd3530 cloudIDE saas定制api 2022-10-12 15:38:40 +08:00
“xxq250” e7bbe252de cloudIDE saas定制api 2022-10-12 15:37:22 +08:00
yystopf 9c11cd79e8 修复：消息模版无法查询子类的问题 2022-10-10 19:06:47 +08:00
viletyy a516363763 Merge branch 'develop' into standalone_develop 2022-10-08 18:44:28 +08:00
yystopf a7384bc1c3 修复：代码详情页报错 2022-10-08 18:44:04 +08:00
viletyy 3d475fdedd Merge branch 'develop' into standalone_develop 2022-09-29 13:59:04 +08:00
yystopf 55170c7693 新增：更改邮箱相关接口文档 2022-09-29 13:58:14 +08:00
yystopf 2cde13eabb 新增：接口测试以及功能测试 2022-09-29 12:05:57 +08:00
yystopf d68e7f38a3 新增：更改邮箱service逻辑 2022-09-29 09:30:33 +08:00
yystopf 649d9c4ea6 新增：更改邮箱控制器方法 2022-09-28 16:09:10 +08:00
“xxq250” e33448db4d fixed nps统计 2022-09-26 16:53:55 +08:00
“xxq250” 628d815a5c Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-09-26 16:12:25 +08:00
“xxq250” c08868b26a fixed 用户活跃数 2022-09-26 16:12:12 +08:00
“xxq250” fce8166ba7 fixed 用户活跃数 2022-09-26 16:11:34 +08:00
“xxq250” ae0efc1115 Merge remote-tracking branch 'origin/develop' into develop 2022-09-26 10:38:32 +08:00
“xxq250” dfc2edd62d fixed注册gitea错误信息 2022-09-26 10:38:28 +08:00
yystopf a030a01050 Merge branch 'develop' into standalone_develop 2022-09-23 17:56:58 +08:00
yystopf d7f3a21add 修复：周统计数据需加入年份 2022-09-23 17:56:39 +08:00
yystopf d9eb335b2a Merge branch 'develop' into standalone_develop 2022-09-23 10:28:19 +08:00
yystopf ef9592ef30 更改：活跃度算法更新 2022-09-23 10:28:12 +08:00
yystopf af7a779af6 merge from develop 2022-09-23 10:09:51 +08:00
yystopf cc42683316 新增：活跃度计算访问量限制 2022-09-23 10:07:52 +08:00
“xxq250” b832a8ecc6 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-09-21 16:00:19 +08:00
“xxq250” 5c123fba17 头歌接口更换密钥 2022-09-21 16:00:13 +08:00
yystopf b7193aa768 Merge branch 'develop' into standalone_develop 2022-09-21 10:06:39 +08:00
yystopf 70f1e6827f 更改：项目已设置语言，则不重新设置语言 2022-09-21 10:06:29 +08:00
yystopf b4e0cc6dc1 Merge branch 'develop' into standalone_develop 2022-09-21 09:55:05 +08:00
yystopf b5188e3272 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-09-21 09:54:53 +08:00
yystopf ff881732d2 更改：项目已设置语言，则不重新设置语言 2022-09-21 09:54:49 +08:00
“xxq250” 2adf87a289 fixed nps数据统计 2022-09-20 09:52:40 +08:00
“xxq250” b3afa15d2e fixed nps数据统计 2022-09-20 09:52:14 +08:00
“xxq250” b40f48f87e Merge branch 'develop' into standalone_develop 2022-09-20 09:48:10 +08:00
“xxq250” 6954a860af fixed nps数据统计 2022-09-20 09:47:29 +08:00
“xxq250” b07e5d6993 Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-09-20 09:43:20 +08:00
“xxq250” bb8e6aeaf8 nps数据统计 2022-09-20 09:41:27 +08:00
“xxq250” ac8959f36f fixed 修改密码接口 2022-09-19 15:51:59 +08:00
“xxq250” 6d7b7dd058 fixed 修改密码接口 2022-09-19 10:06:49 +08:00
yystopf dfc2c68225 新增：管理后台新增类型筛选 2022-09-15 10:21:39 +08:00
yystopf 6a2cfc5fde Merge branch 'develop' into standalone_develop 2022-09-15 10:00:09 +08:00
yystopf 007b90c284 修复：删除旧的逻辑 2022-09-15 10:00:00 +08:00
yystopf 4994179a33 Merge branch 'develop' into standalone_develop 2022-09-15 09:57:34 +08:00
yystopf 481d1b7db0 修复：commit log统计触发规则 2022-09-15 09:57:28 +08:00
yystopf a1b2bdd048 Merge branch 'develop' into standalone_develop 2022-09-15 09:49:51 +08:00
yystopf 733f64eaec 新增：项目排行榜新增提交数算法 2022-09-15 09:44:12 +08:00
yystopf 383660c778 更改：组织缓存信息方式改在控制器里面 2022-09-15 09:38:28 +08:00
“xxq250” 2c2c45476d oauth2认证登录logo 2022-09-09 17:55:44 +08:00
yystopf ecd43dbd12 Merge branch 'develop' into standalone_develop 2022-09-08 14:19:16 +08:00
yystopf 4bd77a870b 更改：webhook创建数量限制为50个 2022-09-08 14:19:08 +08:00
yystopf 9022fdcb80 Merge branch 'develop' into standalone_develop 2022-09-08 10:41:02 +08:00
yystopf b1f460d760 更改：webhook创建数量限制为50个 2022-09-08 10:40:52 +08:00
yystopf a0413be4b9 Merge branch 'develop' into standalone_develop 2022-09-06 14:58:02 +08:00
yystopf a438ab6f3e 新增：提示语locale配置 2022-09-06 14:57:54 +08:00
“xxq250” 3a34d8682c Merge remote-tracking branch 'origin/develop' into develop 2022-09-06 10:30:15 +08:00
“xxq250” 60894f00b1 nps已打分区分 2022-09-06 10:29:51 +08:00
“xxq250” 925b05e004 nps已打分区分 2022-09-06 10:29:49 +08:00
yystopf ce432d9ad3 Merge branch 'develop' into standalone_develop 2022-09-06 09:04:54 +08:00
yystopf 4878d66620 修复 2022-09-06 09:04:46 +08:00
yystopf d240d4f4fa Merge branch 'develop' into standalone_develop 2022-09-06 09:02:37 +08:00
yystopf 632ade9d25 修复 2022-09-06 09:02:30 +08:00
yystopf 36443a54d8 Merge branch 'develop' into standalone_develop 2022-09-06 09:00:24 +08:00
yystopf 5acd45bf85 修复 2022-09-06 09:00:05 +08:00
yystopf d03b45eecf 新增：创建文件对分支长度进行验证 2022-09-06 08:59:24 +08:00
“xxq250” f2b55977c9 nps已打分区分 2022-09-05 13:44:26 +08:00
“xxq250” fd66a3149d nps已打分区分 2022-09-05 13:44:23 +08:00
“xxq250” 4a6e94a98f 调整nps用户调研接口,30天 2022-09-02 15:50:15 +08:00
“xxq250” c60e80da98 调整nps用户调研接口,测试30分钟 2022-09-01 15:13:49 +08:00
“xxq250” eb1a3f8e23 调整nps用户调研接口,需要登录 2022-08-31 10:40:25 +08:00
“xxq250” a7c24dea64 调整nps用户调研接口 2022-08-31 10:40:24 +08:00
“xxq250” 32a9d762d8 调整nps用户调研接口,需要登录 2022-08-31 10:39:52 +08:00
“xxq250” 0a79950046 调整nps用户调研接口 2022-08-31 10:38:21 +08:00
“xxq250” d51bb7030f Merge remote-tracking branch 'origin/develop' into standalone_develop 
# Conflicts:
#	app/views/users/get_user_info.json.jbuilder
 2022-08-30 18:14:17 +08:00
“xxq250” 4b7c58b13f Merge remote-tracking branch 'origin/develop' into develop 2022-08-30 18:10:33 +08:00
“xxq250” 7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
yystopf 1613cf7376 Merge branch 'develop' into standalone_develop 2022-08-30 10:40:37 +08:00
yystopf aa50c50254 修复 2022-08-30 10:40:27 +08:00
yystopf 43a41399ac 新增：添加全部或者移除全部团队项目 2022-08-30 10:35:43 +08:00
yystopf 60b3c7925d 新增：添加全部或者移除全部团队项目[文档] 2022-08-30 10:34:37 +08:00
yystopf 0f41cabe71 新增：添加全部或者移除全部团队项目 2022-08-30 10:23:35 +08:00
“xxq250” 8f4cb2667f fixed 组织成员列表查询优化 2022-08-29 10:08:25 +08:00
“xxq250” d04ed7e008 fixed 组织成员列表查询优化 2022-08-29 10:05:56 +08:00
yystopf 5c5b4b5d92 新增：分页数量限制修改 2022-08-24 10:30:23 +08:00
yystopf 43e07ade99 Merge branch 'develop' into standalone_develop 2022-08-22 10:48:13 +08:00
yystopf 6168256897 修复: diff filepath为空报错 2022-08-22 10:48:05 +08:00
yystopf 7a7a1efc46 Merge branch 'develop' into standalone_develop 2022-08-17 18:39:08 +08:00
yystopf 4b167dacbb 修复: trace user 手机号为空 2022-08-17 18:39:01 +08:00
yystopf 98446220a1 Merge branch 'develop' into standalone_develop 2022-08-17 18:05:22 +08:00
yystopf 911c47df8d 新增：文件blame 上个版本的行号 2022-08-17 18:05:15 +08:00
yystopf 1e4aed71fe Merge branch 'develop' into standalone_develop 2022-08-17 15:29:16 +08:00
yystopf a37d7b9840 修复: 手机号默认不传 2022-08-17 15:28:58 +08:00
“xxq250” c7e098d507 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-08-16 15:33:59 +08:00
“xxq250” dbdb860bb7 fixed commit日志同时更新项目时间 2022-08-16 15:33:46 +08:00
“xxq250” 217ab920a9 fixed commit日志同时更新项目时间 2022-08-16 15:33:15 +08:00
“xxq250” 98ae62d181 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-08-16 14:28:52 +08:00
“xxq250” 98f1723411 fixed 发行版git删除时，不同步处理 2022-08-16 14:28:40 +08:00
yystopf 144fbac843 Merge branch 'develop' into standalone_develop 2022-08-16 14:07:49 +08:00
yystopf 68a38e75bc 修复: 消息返回接口时间 2022-08-16 14:07:37 +08:00
“xxq250” 81b64c18b6 fixed 发行版git删除时，不同步处理log 2022-08-16 14:03:05 +08:00
“xxq250” 0c10f3ff10 fixed 发行版git删除时，不同步处理log 2022-08-16 11:50:09 +08:00
“xxq250” c6034ed33f fixed 发行版git删除时，不同步处理test 2022-08-16 11:48:39 +08:00
“xxq250” 4618f4effa fixed 发行版git删除时，不同步处理 2022-08-16 11:46:58 +08:00
“xxq250” b2af43ee2a 增加建木devops地址配置 2022-08-16 11:34:20 +08:00
“xxq250” f211fbaec3 增加建木devops地址配置URI.encode 2022-08-16 11:31:43 +08:00
“xxq250” 14c1be1bea 增加建木devops地址配置 2022-08-16 11:29:33 +08:00
yystopf 63cdaed3ac 更改：代码溯源status改为code 2022-08-15 15:56:07 +08:00
yystopf ee29c6be5c Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-08-15 15:55:37 +08:00
yystopf c0ee0a694c 更改：代码溯源status改为code 2022-08-15 15:55:33 +08:00
“xxq250” 12cc870dc7 fixed time ago优化 2022-08-15 15:47:30 +08:00
“xxq250” e5989b219f fixed reposyncer job任务增加分页 2022-08-15 14:04:06 +08:00
“xxq250” 25fa6f427b Merge remote-tracking branch 'origin/develop' into develop 2022-08-15 14:03:32 +08:00
“xxq250” 467d722d25 fixed reposyncer job任务增加分页 2022-08-15 14:03:27 +08:00
yystopf 04cd427c5f 新增：代码溯源需提前获取服务器是否在维护 2022-08-12 18:15:59 +08:00
yystopf 9992a78161 Merge branch 'develop' into standalone_develop 2022-08-12 17:24:15 +08:00
yystopf 3e352d3c7c 新增：获取代码溯源系统维护信息接口 2022-08-12 17:23:19 +08:00
viletyy 6bb1dcf718 Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-08-11 15:21:37 +08:00
yystopf 13472b2311 新增: 合并请求评论查询is_full 2022-08-11 15:21:11 +08:00
viletyy 71b42e462e merge from develop 2022-08-11 09:52:43 +08:00
“xxq250” bdddd655bf Merge remote-tracking branch 'origin/develop' into develop 2022-08-11 09:31:49 +08:00
“xxq250” 6ec7a13293 fixed reposyncer 分支组合已配置，不能重复 2022-08-11 09:31:40 +08:00
“xxq250” 716b29c25f fixed 消息模板配置type 2022-08-11 09:29:37 +08:00
“xxq250” 5c4930a362 fixed 消息模板配置type 2022-08-11 09:29:36 +08:00
“xxq250” ad8fed9440 fixed 消息模板配置type 2022-08-11 09:29:35 +08:00
“xxq250” 964bef7896 fixed 消息模板配置type 2022-08-11 09:29:34 +08:00
“xxq250” 7e48e5e8b8 fixed 消息模板配置 2022-08-11 09:29:34 +08:00
“xxq250” 48846a7e31 fixed 已读未读标记优化 2022-08-11 09:29:33 +08:00
yystopf 32db15aad5 新增: commit找不到返回404 2022-08-11 09:29:12 +08:00
“xxq250” 8ec3e4bbaa fixed Gitea::PullRequest::FilesService增加参数 2022-08-11 09:28:12 +08:00
“xxq250” c167c39050 fixed 消息模板配置type 2022-08-10 17:43:27 +08:00
“xxq250” 58368277c0 fixed 消息模板配置type 2022-08-10 17:25:55 +08:00
“xxq250” 4918fda2e1 fixed 消息模板配置type 2022-08-10 17:23:27 +08:00
“xxq250” 9ce7cdf0c3 fixed 消息模板配置type 2022-08-10 17:20:29 +08:00
“xxq250” e46c934b2c fixed 消息模板配置 2022-08-10 16:54:00 +08:00
“xxq250” b949ee260d fixed 已读未读标记优化 2022-08-10 16:07:20 +08:00
“xxq250” c60572e31f fixed Gitea::PullRequest::FilesService增加参数 2022-08-10 16:06:11 +08:00
“xxq250” 1efff8a97a Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-08-09 10:23:01 +08:00
“xxq250” 4199f4097c fixed reposyncer gitlink地址配置文件取 2022-08-09 10:22:55 +08:00
yystopf a0dcc289c8 Merge branch 'develop' into standalone_develop 2022-08-09 09:48:14 +08:00
yystopf 4b05838498 新增：合并请求评论新增path参数筛选以及去掉分页最多返回200数据 2022-08-09 09:48:02 +08:00
yystopf 0699c768a5 新增：fork仓库不支持代码溯源 2022-08-08 14:17:45 +08:00
“xxq250” e7aa05b535 fixed reposyncer 删除job任务 2022-08-05 13:48:40 +08:00
“xxq250” 99ba523084 fixed reposyncer job_logs 2022-08-05 11:45:46 +08:00
“xxq250” 14f4b290cb fixed reposyncer job_logs 2022-08-05 11:42:40 +08:00
yystopf 65e1cd2c01 Merge branch 'develop' into standalone_develop 2022-08-05 11:05:37 +08:00
yystopf b8be0c23cb 修复 2022-08-05 11:05:29 +08:00
yystopf d4405b8827 Merge branch 'develop' into standalone_develop 2022-08-05 10:50:52 +08:00
yystopf d20a7b1318 修复：项目协作者添加组织成员问题 2022-08-05 10:50:41 +08:00
yystopf 0993e5a3ae Merge branch 'develop' into standalone_develop 2022-08-04 17:28:29 +08:00
yystopf f8268accc0 新增： 组织下项目协作者添加当前用户 2022-08-04 17:28:14 +08:00
“xxq250” 690ddcb4a7 fixed reposyncer 分支组合已配置，不能重复 2022-08-04 17:20:24 +08:00
“xxq250” 72a4549fe9 fixed reposyncer jobs 分组 2022-08-04 17:02:25 +08:00
“xxq250” 4fb2003f64 fixed reposyncer 分支组合已配置，不能重复 2022-08-04 16:50:01 +08:00
“xxq250” 5c361207f5 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-08-04 16:24:25 +08:00
“xxq250” 4941e08684 fixed reposyncer job_type 2022-08-04 16:24:19 +08:00
yystopf 7e711cfdab Merge branch 'develop' into standalone_develop 2022-08-04 15:46:32 +08:00
yystopf a9811768d4 修复: 合并请求评论类型允许为空 2022-08-04 15:46:19 +08:00
“xxq250” ebe8df8221 fixed reposyncer delete 2022-08-04 11:24:15 +08:00
“xxq250” 1b3a4bc146 fixed reposyncer gitlink地址 2022-08-04 10:37:28 +08:00
“xxq250” 7332e4a58b Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-08-04 10:03:34 +08:00
“xxq250” 1a2352c535 fixed reposyncer gitlink地址 2022-08-04 10:03:29 +08:00
yystopf 958ee42fa2 Merge branch 'develop' into standalone_develop 2022-08-03 17:13:53 +08:00
yystopf 024bc289de 修改: 合并请求评论必选参数以及审查列表去掉分页 2022-08-03 17:13:45 +08:00
yystopf 90a621ed8e Merge branch 'develop' into standalone_develop 2022-08-03 15:31:14 +08:00
yystopf 96d34d0237 修改：合并请求审查权限 2022-08-03 15:31:04 +08:00
yystopf 64e608ffd7 Merge branch 'develop' into standalone_develop 2022-08-03 14:20:39 +08:00
yystopf fea11bdc2e 新增：webhook type类型 2022-08-03 14:20:25 +08:00
yystopf 0be06c8282 Merge branch 'develop' into standalone_develop 2022-08-02 19:04:04 +08:00
yystopf ab5d273f98 新增：版本diff新增diff信息 2022-08-02 19:03:54 +08:00
“xxq250” 8bf4e9b8d2 fixed Repository.url 2022-08-02 18:10:01 +08:00
“xxq250” bf6a11dadd Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-08-02 15:27:31 +08:00
“xxq250” 9d385845a6 fixed 评审标记为已读和未读 2022-08-02 15:27:16 +08:00
yystopf d4d8153003 Merge branch 'develop' into standalone_develop 2022-08-01 17:14:41 +08:00
yystopf 096b0b954d 新增: fork仓库协作者可以提交文件至仓库 2022-08-01 17:14:32 +08:00
yystopf b06e29260a 修复: return error status默认为-1 2022-08-01 14:28:44 +08:00
yystopf 29bfeabb20 merge from develop 2022-07-29 17:29:52 +08:00
yystopf df57312056 修复 2022-07-29 17:29:25 +08:00
“xxq250” 7597f1fd8f fixed 建木认证code,项目成员可见 2022-07-29 16:30:56 +08:00
“xxq250” 8dba81bfca fixed 建木认证code加密生成,key=Client Secret 2022-07-29 15:37:24 +08:00
“xxq250” 531747024d fixed 建木认证code加密生成,key=Client Secret 2022-07-29 15:35:12 +08:00
“xxq250” a560a5034c fixed 建木认证code加密生成 2022-07-29 14:20:56 +08:00
“xxq250” 34504ddc39 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-07-29 14:18:58 +08:00
“xxq250” 29342e11fb 建木认证code加密生成 2022-07-29 14:18:53 +08:00
yystopf adb55c0910 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-07-28 18:14:05 +08:00
yystopf 902c66d490 更改: oauth2授权页面增加错误提示 2022-07-28 18:14:00 +08:00
“xxq250” 8a187df5f4 fixed CloudIDEA文件标记已读未读列表 2022-07-28 17:59:20 +08:00
“xxq250” 93fd9333ec fixed CloudIDEA文件标记已读未读列表 2022-07-28 17:56:44 +08:00
“xxq250” 487c6dc21a fixed CloudIDEA文件标记已读未读列表 2022-07-28 17:55:31 +08:00
“xxq250” 0936bbd1c8 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-07-28 17:53:48 +08:00
“xxq250” 2b31b683dd fixed CloudIDEA文件标记已读未读列表 2022-07-28 17:53:43 +08:00
“xxq250” 27fae8d27b fixed 精选项目不包含私有仓库 2022-07-28 17:31:07 +08:00
“xxq250” f12cfabee3 fixed 精选项目不包含私有仓库 2022-07-28 17:30:09 +08:00
“xxq250” b22909a654 fixed 语言接口token参数错误 2022-07-28 17:20:22 +08:00
“xxq250” 579b45dfa4 fixed 精选项目不包含私有仓库 2022-07-28 17:19:39 +08:00
“xxq250” 99850e45ad fixed 语言接口token参数错误 2022-07-28 17:15:34 +08:00
“xxq250” 321f367e3e Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-07-28 16:46:27 +08:00
“xxq250” fbc1f95cd1 Merge remote-tracking branch 'origin/develop' into develop 2022-07-28 16:42:29 +08:00
“xxq250” 4ccf8ea5ff CloudIDEA文件标记已读未读 2022-07-28 16:42:21 +08:00
yystopf d5c141f892 修复：pulls文件夹load 2022-07-28 15:19:31 +08:00
yystopf 35c6cb98db 新增：批量提交文件支持参数选填 2022-07-28 14:25:33 +08:00
yystopf f417e42864 修复: 提示修改 2022-07-28 14:02:37 +08:00
yystopf 6e54203ebb 修复：批量提交文件参数缺失以及数据为空处理 2022-07-28 13:56:31 +08:00
“xxq250” 79a6841bbc Merge remote-tracking branch 'origin/develop' into develop 2022-07-28 09:31:19 +08:00
“xxq250” b3d78741a3 fixed reposyncer同步仓库接口增加gitlink 2022-07-28 09:31:14 +08:00
yystopf 445ae6fbc3 merge from develop 2022-07-27 16:12:12 +08:00
yystopf 935f3ddf7f Merge pull request '合并请求评论相关接口及文档' (#20) from yystopf/forgeplus:develop into develop 2022-07-27 16:11:17 +08:00
yystopf a2549f7ff1 新增: 评论及审查相关接口文档 2022-07-27 16:07:15 +08:00
yystopf d6b5dc326a 新增: 评论相关api根据需求重写 2022-07-27 14:52:49 +08:00
“xxq250” d6c6ac9a0a fixed reposyncer同步仓库接口增加gitlink 2022-07-26 18:13:29 +08:00
“xxq250” f3233b145b fixed reposyncer同步仓库接口 2022-07-26 18:11:09 +08:00
“xxq250” d8d841d800 fixed reposyncer同步仓库接口 2022-07-26 18:10:35 +08:00
“xxq250” bcea5bc669 fixed 邮箱验证正则优化 2022-07-26 17:11:46 +08:00
“xxq250” 003bfe7884 Merge remote-tracking branch 'origin/develop' into develop 2022-07-26 17:08:10 +08:00
“xxq250” df5efa0dc6 fixed 邮箱验证正则优化 2022-07-26 17:08:05 +08:00
yystopf a35db9fe80 新增：reviewers修改入口 2022-07-26 16:45:53 +08:00
“xxq250” 5be93d5de8 关闭rack-mini-profiler 2022-07-26 16:32:53 +08:00
“xxq250” 99d9e13edc Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-07-26 15:44:11 +08:00
“xxq250” 4686b5241e fixed 同步仓库增加gitlink-url 2022-07-26 15:44:04 +08:00
yystopf 5025bf6961 Merge branch 'develop' into standalone_develop 2022-07-26 14:38:50 +08:00
yystopf 6183f1f76d 修复: 缺少title和body 2022-07-26 14:38:41 +08:00
yystopf 034170372e Merge branch 'develop' into standalone_develop 2022-07-26 14:29:21 +08:00
yystopf e72273f3b2 修复: 合并请求详情中review需要最新的一个 2022-07-26 14:29:12 +08:00
yystopf 70220638fd merge from develop 2022-07-26 14:22:18 +08:00
yystopf cc09f724cc Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-07-26 14:14:33 +08:00
yystopf 7a54c5f536 新增: 接口文档更新 2022-07-26 14:14:25 +08:00
“xxq250” b1809909db fixed reposyncer同步仓库接口 2022-07-26 11:41:21 +08:00
“xxq250” bb3f5cec76 fixed reposyncer同步仓库接口 2022-07-26 11:40:49 +08:00
“xxq250” 19ffd9fea1 fixed PullRequest 统一关联关系字段gitea_id 2022-07-26 10:55:42 +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 3f5754a3a5 新增：合并请求详情接口 2022-07-25 18:23:06 +08:00
yystopf 5463c22518 新增: 合并请求创建审查接口 2022-07-25 17:28:38 +08:00
yystopf 5db43bf768 新增：新合并请求列表接口 2022-07-25 16:21:03 +08:00
yystopf 1feb166fd5 修复：合并请求评审模型修改 2022-07-25 16:20:42 +08:00
yystopf db4e98ec37 修复：代码溯源跳转地址修改 2022-07-25 11:00:07 +08:00
yystopf 56b1110e4d Merge branch 'develop' into standalone_develop 2022-07-22 18:10:09 +08:00
yystopf 0df1e5fdd0 新增：合并请求版本列表和diff接口文档 2022-07-22 18:08:16 +08:00
yystopf 8ba70a33be 新增: pr版本列表和diff接口 2022-07-22 17:33:08 +08:00
yystopf 3a12b7b16c 新增：代码溯源展示页面url返回 2022-07-22 13:44:07 +08:00
yystopf 4aebba2f25 修复：代码溯源cookie domain配置 2022-07-22 11:16:04 +08:00
yystopf 95cf55993d Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-07-22 10:22:28 +08:00
yystopf 81b684e469 修复:代码溯源cookie domain 2022-07-22 10:22:22 +08:00
“xxq250” 0b167026f8 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-07-22 10:12:19 +08:00
“xxq250” 913057658e fixed 代码提交日志根据提交commit记录多次 2022-07-22 10:12:13 +08:00
“xxq250” b21f44b59e fixed 代码提交日志根据提交commit记录多次 2022-07-22 10:11:21 +08:00
yystopf 8645642612 新增：代码溯源设置cookie用于访问 2022-07-22 09:35:47 +08:00
yystopf abac8b9c46 修复: 代码溯源pdf只需下载一次 2022-07-21 10:52:21 +08:00
yystopf 88fb11ea92 修复：代码溯源pdf下载 2022-07-21 10:41:24 +08:00
yystopf 545ec28561 Merge branch 'develop' into standalone_develop 2022-07-19 16:47:19 +08:00
yystopf 7793eacf75 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-07-19 16:47:06 +08:00
yystopf 25afedcdfd 新增: 批量更改文件 2022-07-19 16:47:01 +08:00
“xxq250” c41c4f5813 fixed 2022-07-19 15:04:17 +08:00
“xxq250” d95a689815 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-07-19 14:58:29 +08:00
xiaoxiaoqiong b386dc51e4 fixed 后台统计优化,7天时间精确 2022-07-19 14:56:02 +08:00
yystopf 1882120df3 新增: 获取单文件blame信息 2022-07-19 11:14:50 +08:00
yystopf 274cd81655 新增：获取commit列表 2022-07-19 10:41:25 +08:00
xiaoxiaoqiong 52bd568789 fixed 后台统计优化,7天时间精确 2022-07-19 09:43:03 +08:00
xiaoxiaoqiong d9b78acb8e Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-07-19 09:32:15 +08:00
xiaoxiaoqiong bfd2c1d5c7 fixed 后台统计优化,issue当成活跃项目指标 2022-07-19 09:31:51 +08:00
yystopf 92be882e54 Merge branch 'develop' into standalone_develop 2022-07-18 15:40:42 +08:00
yystopf 6273349334 新增: 获取比较blame、token以及异常捕获处理 2022-07-18 15:39:51 +08:00
yystopf f161349bd7 Merge branch 'develop' into standalone_develop 2022-07-18 11:19:23 +08:00
yystopf 52701d1c2f Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-07-18 11:18:35 +08:00
yystopf b248f770f1 新增：获取单个提交的blame信息接口以及文档 2022-07-18 11:18:29 +08:00
xiaoxiaoqiong 04b9e43382 fixed 后台统计优化,新增项目数 2022-07-18 11:14:45 +08:00
xiaoxiaoqiong 07518f0d00 fixed 后台统计优化,新增项目数 2022-07-18 11:11:15 +08:00
xiaoxiaoqiong e71d28736d Merge branch 'develop' into standalone_develop 2022-07-18 11:05:11 +08:00
xiaoxiaoqiong 3580a8653d fixed 后台统计优化,新增项目数 2022-07-18 11:04:57 +08:00
xiaoxiaoqiong 2c799bd0a5 Merge branch 'develop' into standalone_develop 2022-07-18 11:01:05 +08:00
xiaoxiaoqiong d9653e461e fixed 后台统计优化,周存率小数计算 2022-07-18 11:00:47 +08:00
xiaoxiaoqiong 00f4e100c6 Merge branch 'develop' into standalone_develop 2022-07-18 10:57:15 +08:00
xiaoxiaoqiong d9a1d32ec8 fixed 后台统计优化,周存率 2022-07-18 10:55:41 +08:00
xiaoxiaoqiong b5dfd83527 fix 提交日志提交用户信息不匹配 2022-07-18 10:43:57 +08:00
xiaoxiaoqiong e6e1b56309 后台统计优化 2022-07-18 10:42:45 +08:00
xiaoxiaoqiong 8dae15225e 后台统计优化 2022-07-18 10:37:53 +08:00
xiaoxiaoqiong 5fcf789e63 fixed 提交日志记录用户信息,仓库关联 2022-07-18 09:35:19 +08:00
xiaoxiaoqiong ed0655452c 增加从webhook接收仓库日志记录 2022-07-18 09:34:56 +08:00
yystopf 6de6e34a4e Merge branch 'develop' into standalone_develop 2022-07-15 17:03:31 +08:00
yystopf 0dd062ce1c 新增: blobs和文件树接口及文档 2022-07-15 17:03:18 +08:00
yystopf c30c56f77b Merge branch 'develop' into standalone_develop 2022-07-15 14:41:12 +08:00
yystopf b8d4b15b40 新增: 分支接口文档 2022-07-15 14:40:35 +08:00
yystopf 63cd6bb0a4 merge from develop 2022-07-15 14:04:02 +08:00
yystopf 24d83133e7 新增: 创建分支接口 2022-07-15 14:02:48 +08:00
yystopf 4ed3a9d478 修复:cherry pick doorkeeper配置 2022-07-14 18:13:06 +08:00
xiaoxiaoqiong 3cb97ed830 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-07-14 15:21:50 +08:00
xiaoxiaoqiong a5d1058ea9 fixed 提交日志记录用户信息,仓库关联 2022-07-14 15:21:42 +08:00
yystopf 9b50b9df00 merge from develop 2022-07-14 09:38:00 +08:00
yystopf fbbacfa983 修复: apk文件为下载文件 2022-07-14 09:36:52 +08:00