Commit Graph

643 Commits

Author SHA1 Message Date
2df259c927 Merge branch 'develop' into standalone_develop 2022-10-14 15:02:53 +08:00
9c11cd79e8 修复:消息模版无法查询子类的问题 2022-10-10 19:06:47 +08:00
a030a01050 Merge branch 'develop' into standalone_develop 2022-09-23 17:56:58 +08:00
d7f3a21add 修复:周统计数据需加入年份 2022-09-23 17:56:39 +08:00
af7a779af6 merge from develop 2022-09-23 10:09:51 +08:00
cc42683316 新增:活跃度计算访问量限制 2022-09-23 10:07:52 +08:00
6a2cfc5fde Merge branch 'develop' into standalone_develop 2022-09-15 10:00:09 +08:00
007b90c284 修复:删除旧的逻辑 2022-09-15 10:00:00 +08:00
a1b2bdd048 Merge branch 'develop' into standalone_develop 2022-09-15 09:49:51 +08:00
733f64eaec 新增:项目排行榜新增提交数算法 2022-09-15 09:44:12 +08:00
383660c778 更改:组织缓存信息方式改在控制器里面 2022-09-15 09:38:28 +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”
7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
7a7a1efc46 Merge branch 'develop' into standalone_develop 2022-08-17 18:39:08 +08:00
4b167dacbb 修复: trace user 手机号为空 2022-08-17 18:39:01 +08:00
1e4aed71fe Merge branch 'develop' into standalone_develop 2022-08-17 15:29:16 +08:00
a37d7b9840 修复: 手机号默认不传 2022-08-17 15:28:58 +08:00
“xxq250”
98f1723411 fixed 发行版git删除时,不同步处理 2022-08-16 14:28:40 +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
6bb1dcf718 Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-08-11 15:21:37 +08:00
13472b2311 新增: 合并请求评论查询is_full 2022-08-11 15:21:11 +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”
4918fda2e1 fixed 消息模板配置type 2022-08-10 17:23:27 +08:00
“xxq250”
9ce7cdf0c3 fixed 消息模板配置type 2022-08-10 17:20:29 +08:00
0be06c8282 Merge branch 'develop' into standalone_develop 2022-08-02 19:04:04 +08:00
“xxq250”
8bf4e9b8d2 fixed Repository.url 2022-08-02 18:10:01 +08:00
“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
445ae6fbc3 merge from develop 2022-07-27 16:12:12 +08:00
a2549f7ff1 新增: 评论及审查相关接口文档 2022-07-27 16:07:15 +08:00
d6b5dc326a 新增: 评论相关api根据需求重写 2022-07-27 14:52: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
5463c22518 新增: 合并请求创建审查接口 2022-07-25 17:28:38 +08:00
1feb166fd5 修复:合并请求评审模型修改 2022-07-25 16:20:42 +08:00
xiaoxiaoqiong
ed0655452c 增加从webhook接收仓库日志记录 2022-07-18 09:34:56 +08:00
xiaoxiaoqiong
07ec114e9a fixed 提交日志记录用户信息 2022-07-13 13:13:10 +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
f8b63ff02e merge from develop 2022-07-07 13:47:47 +08:00
76cc185a1d 新增: 合并请求审核model 2022-06-29 17:16:29 +08:00
7e5d5e31e5 merge from develop 2022-06-20 10:21:10 +08:00
45b7f70d9f 新增:项目邀请链接增加时间限制,以及show_link接口新增 2022-06-20 10:16:39 +08:00
1ebb6cb561 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-06-20 09:34:29 +08:00