Commit Graph

203 Commits

Author SHA1 Message Date
ee0f09c8fa Merge branch 'develop' into standalone_develop 2022-11-25 14:19:20 +08:00
35cf298f5d fixed 增加emoji表情支持表字段,长度限制 2022-11-25 14:19:05 +08:00
04814bafbb Merge branch 'develop' into standalone_develop 2022-11-25 14:16:01 +08:00
ee5d959404 fixed 增加emoji表情支持表字段,长度限制 2022-11-25 14:15:47 +08:00
15cbb9ee72 Merge branch 'develop' into standalone_develop 2022-11-25 14:11:05 +08:00
7f47cd8d46 fixed 增加emoji表情支持表字段 2022-11-25 14:09:26 +08:00
29d2ca63ed 取消lastname同步nickname 2022-11-23 18:15:27 +08:00
8f8dab10c3 fixed 增加emoji表情支持 2022-11-23 17:58:51 +08:00
“xxq250”
1c71eab72e fixed 增加emoji表情支持 2022-11-23 17:11:27 +08:00
“xxq250”
f23f02cb80 fixed 增加emoji表情支持 2022-11-23 17:07:54 +08:00
9f74651a2b Merge branch 'develop' into standalone_develop 2022-11-15 14:42:07 +08:00
64c6f69f56 新增:统计项目分类下私有项目的数量 2022-11-15 14:25:35 +08:00
33a3d7f48c merge from develop 2022-11-09 14:37:27 +08:00
83b46fcb50 新增:用户反馈意见后台管理逻辑 2022-11-09 11:37:12 +08:00
2b2a44831e Merge branch 'develop' into standalone_develop 2022-11-08 13:41:00 +08:00
3e5c1da2c5 新增:反馈意见模型及接口 2022-11-08 13:27:46 +08:00
af7a779af6 merge from develop 2022-09-23 10:09:51 +08:00
cc42683316 新增:活跃度计算访问量限制 2022-09-23 10:07:52 +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
“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
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
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
f8b63ff02e merge from develop 2022-07-07 13:47:47 +08:00
76cc185a1d 新增: 合并请求审核model 2022-06-29 17:16:29 +08:00
79cbeb846b Merge branch 'develop' into standalone_develop 2022-06-20 13:05:35 +08:00
531495429c 修复: 无法正常更改token长度的问题 2022-06-20 13:05:25 +08:00
e75f5f655f Merge branch 'develop' into standalone_develop 2022-06-20 10:34:32 +08:00
bed2469014 fix: change error 2022-06-20 10:34:25 +08:00
7e5d5e31e5 merge from develop 2022-06-20 10:21:10 +08:00
1ebb6cb561 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-06-20 09:34:29 +08:00
21ccedab9c 修复: doorkeeper 无法生成jwt token 2022-06-17 18:33:37 +08:00
xiaoxiaoqiong
1f9caeece5 auth2接入 2022-06-17 17:02:24 +08:00
c42f3d5928 新增:邀请用户链接生成 2022-06-17 14:06:59 +08:00
94881dd72a add: user trace tasks record 2022-05-13 14:31:59 +08:00
0e4c0a46c2 fix 2022-05-13 13:56:12 +08:00
7750cbe272 add: project trace tasks count 2022-05-12 09:43:55 +08:00
1f13bba52e add: trace user tasks_count 2022-05-12 09:43:55 +08:00
20af4a7d82 Merge branch 'develop' into standalone_develop 2022-05-06 17:25:52 +08:00
000197b0d1 fix: issues and pull_request length calculate 2022-05-06 17:25:34 +08:00
11724bf63f Merge branch 'develop' into standalone_develop 2022-04-28 11:04:01 +08:00
ec3a556a6f fix: default value for show super description 2022-04-28 11:03:42 +08:00