Commit Graph

363 Commits

Author SHA1 Message Date
“xxq250”
7c7369730b Merge branch 'pre_trustie_server' into trustie_server 2022-09-02 16:10:30 +08:00
“xxq250”
9e4100bfab Merge branch 'standalone_develop' into pre_trustie_server 2022-09-02 16:02:23 +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
43a41399ac 新增:添加全部或者移除全部团队项目 2022-08-30 10:35:43 +08:00
0f41cabe71 新增:添加全部或者移除全部团队项目 2022-08-30 10:23:35 +08:00
3445838e80 Merge branch 'pre_trustie_server' into trustie_server 2022-08-24 17:56:48 +08:00
“xxq250”
092e3e2546 Merge branch 'standalone_develop' into pre_trustie_server 2022-08-12 15:44:45 +08:00
“xxq250”
eac06382fe fixed reposyncer logs routes 2022-08-05 11:41:13 +08:00
“xxq250”
9d385845a6 fixed 评审标记为已读和未读 2022-08-02 15:27:16 +08:00
1410ba144c Merge branch 'pre_trustie_server' into trustie_server 2022-07-29 18:53:52 +08:00
275456bf5f Merge branch 'standalone_develop' into pre_trustie_server 2022-07-29 18:53:33 +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
5463c22518 新增: 合并请求创建审查接口 2022-07-25 17:28:38 +08:00
56b1110e4d Merge branch 'develop' into standalone_develop 2022-07-22 18:10:09 +08:00
0df1e5fdd0 新增:合并请求版本列表和diff接口文档 2022-07-22 18:08:16 +08:00
8ba70a33be 新增: pr版本列表和diff接口 2022-07-22 17:33:08 +08:00
“xxq250”
de538364f4 Merge branch 'pre_trustie_server' into trustie_server 2022-07-21 17:12:03 +08:00
“xxq250”
bacac130ea Merge branch 'standalone_develop' into pre_trustie_server 2022-07-21 17:11:32 +08:00
35a0307667 merge from pre_trustie_server 2022-07-21 10:43:58 +08:00
“xxq250”
2ddf8ebf09 fixed 修改跨域方式trustie.net 2022-07-19 18:05:53 +08:00
“xxq250”
cb0112fde8 fixed 修改跨域方式 2022-07-19 17:58:52 +08:00
“xxq250”
b7a93137db fixed 修改跨域方式 2022-07-19 17:56:06 +08:00
“xxq250”
4e51ad0cf3 fixed 修改跨域方式 2022-07-19 17:51:56 +08:00
“xxq250”
c14cfdeca7 fixed 修改跨域方式 2022-07-19 17:48:32 +08:00
“xxq250”
0c34e186ab fixed 修改跨域方式 2022-07-19 17:47:45 +08:00
545ec28561 Merge branch 'develop' into standalone_develop 2022-07-19 16:47:19 +08:00
25afedcdfd 新增: 批量更改文件 2022-07-19 16:47:01 +08:00
1882120df3 新增: 获取单文件blame信息 2022-07-19 11:14:50 +08:00
274cd81655 新增:获取commit列表 2022-07-19 10:41:25 +08:00
92be882e54 Merge branch 'develop' into standalone_develop 2022-07-18 15:40:42 +08:00
6273349334 新增: 获取比较blame、token以及异常捕获处理 2022-07-18 15:39:51 +08:00
f161349bd7 Merge branch 'develop' into standalone_develop 2022-07-18 11:19:23 +08:00
52701d1c2f Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-07-18 11:18:35 +08:00
b248f770f1 新增:获取单个提交的blame信息接口以及文档 2022-07-18 11:18:29 +08:00
xiaoxiaoqiong
ed0655452c 增加从webhook接收仓库日志记录 2022-07-18 09:34:56 +08:00
6de6e34a4e Merge branch 'develop' into standalone_develop 2022-07-15 17:03:31 +08:00
0dd062ce1c 新增: blobs和文件树接口及文档 2022-07-15 17:03:18 +08:00
63cd6bb0a4 merge from develop 2022-07-15 14:04:02 +08:00
24d83133e7 新增: 创建分支接口 2022-07-15 14:02:48 +08:00
4ed3a9d478 修复:cherry pick doorkeeper配置 2022-07-14 18:13:06 +08:00
d7a970e7d5 修复: oauth2 验证统一改为application控制器里的user_setup 2022-07-11 18:51:07 +08:00
xiaoxiaoqiong
915e689ef9 oauth2 增加client方式 2022-07-11 18:19:08 +08:00