Commit Graph

3210 Commits

Author SHA1 Message Date
xiaoxiaoqiong
fe4dca2eb7 Merge branch 'pre_trustie_server' into trustie_server 2022-05-30 11:20:37 +08:00
xiaoxiaoqiong
9d0980ecfd Merge branch 'standalone_develop' into pre_trustie_server 2022-05-30 11:19:45 +08:00
xiaoxiaoqiong
f66e951f31 Merge branch 'develop' into standalone_develop 2022-05-30 11:19:13 +08:00
xiaoxiaoqiong
d6fd85f536 Repository.url重写,导入项目时为空 2022-05-30 11:18:24 +08:00
xiaoxiaoqiong
b1d3b9ee5f Merge branch 'pre_trustie_server' into trustie_server 2022-05-30 10:44:21 +08:00
xiaoxiaoqiong
3b5da788a8 Merge branch 'standalone_develop' into pre_trustie_server 2022-05-30 10:44:00 +08:00
xiaoxiaoqiong
331dfa4b12 Merge branch 'develop' into standalone_develop 2022-05-30 10:26:35 +08:00
xiaoxiaoqiong
6448a30e03 render_error替换成tip_exception 2022-05-30 10:25:43 +08:00
xiaoxiaoqiong
17fb43cea8 render_error替换成tip_exception 2022-05-30 10:24:39 +08:00
xiaoxiaoqiong
5e5093a44c Merge branch 'pre_trustie_server' into trustie_server 2022-05-27 16:56:27 +08:00
xiaoxiaoqiong
d27f55bb35 fixed ci报错200处理 2022-05-27 16:55:52 +08:00
xiaoxiaoqiong
e76822eb34 fixed ci报错200处理 2022-05-27 16:54:09 +08:00
xiaoxiaoqiong
2fbd93114c Merge branch 'pre_trustie_server' into trustie_server 2022-05-27 14:47:31 +08:00
xiaoxiaoqiong
d48e1a82b1 Merge branch 'standalone_develop' into pre_trustie_server 2022-05-27 14:46:26 +08:00
xiaoxiaoqiong
1220223322 rake导入项目,无语言处理 2022-05-27 14:43:16 +08:00
xiaoxiaoqiong
0b35f56212 rake导入项目,无语言处理 2022-05-27 14:31:29 +08:00
xiaoxiaoqiong
95f98710d6 rake导入项目 2022-05-27 14:26:53 +08:00
xiaoxiaoqiong
40a987116f rake导入项目 2022-05-27 14:25:16 +08:00
xiaoxiaoqiong
a00b1d4530 rake导入项目 2022-05-27 14:21:00 +08:00
xiaoxiaoqiong
48cf92a2cf rake导入项目 2022-05-27 14:19:57 +08:00
bb8e8f2d94 Merge branch 'pre_trustie_server' into trustie_server 2022-05-27 10:49:39 +08:00
6c94da3f05 Merge branch 'standalone_develop' into pre_trustie_server 2022-05-27 10:49:22 +08:00
2a387ad997 Merge branch 'develop' into standalone_develop 2022-05-27 10:48:38 +08:00
a6e50d2a25 修复 devops无法激活项目的问题 2022-05-27 10:48:20 +08:00
f6e8f24480 Merge branch 'develop' into standalone_develop 2022-05-26 15:09:26 +08:00
bd16ca476d 增加: 退出仓库api文档 2022-05-26 15:08:42 +08:00
6eaf491f70 Merge branch 'pre_trustie_server' into trustie_server 2022-05-25 15:49:21 +08:00
d4d00b30bf Merge branch 'standalone_develop' into pre_trustie_server 2022-05-25 11:47:55 +08:00
19ec81e975 Merge branch 'develop' into standalone_develop 2022-05-25 11:47:44 +08:00
2ea78b4f20 增加: 已登录用户对用户名、邮箱、电话进行校验 2022-05-25 11:47:35 +08:00
4c066b30ef Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 18:10:28 +08:00
ad9bb8e542 修复: 合并从develop 2022-05-24 18:10:20 +08:00
e36c7a4b6a 修复: 邮箱搜索不需要return 404 2022-05-24 18:09:36 +08:00
18c4c6ae2f Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 17:38:21 +08:00
9979c87d0c 修复: 合并从develop 2022-05-24 17:27:24 +08:00
8e8ec821f2 新增: 根据邮箱来获取用户 2022-05-24 17:26:10 +08:00
xiaoxiaoqiong
774b1bc79e Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 15:24:43 +08:00
xiaoxiaoqiong
94166a363c fixed 增加自动登录,gitea注册 2022-05-24 15:24:15 +08:00
xiaoxiaoqiong
0219a1fdde Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 14:34:29 +08:00
xiaoxiaoqiong
ebe5fad7dd fixed 增加自动登录,gitea注册 2022-05-24 14:33:23 +08:00
xiaoxiaoqiong
b2e7491ade Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 14:15:21 +08:00
xiaoxiaoqiong
85a36ca2e7 fixed 增加自动登录,gitea注册 2022-05-24 14:14:57 +08:00
xiaoxiaoqiong
b0f80012ab Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 14:08:58 +08:00
xiaoxiaoqiong
75cef14605 fixed 增加自动登录,gitea注册 2022-05-24 14:08:33 +08:00
xiaoxiaoqiong
0fc96026c8 Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 14:01:01 +08:00
xiaoxiaoqiong
93f8b659a1 fixed 增加自动登录,gitea注册 2022-05-24 14:00:15 +08:00
xiaoxiaoqiong
b45ee11239 fixed 增加自动登录,gitea注册 2022-05-24 13:46:58 +08:00
xiaoxiaoqiong
553d3a019f Merge branch 'standalone_develop' into pre_trustie_server 2022-05-24 11:50:30 +08:00
xiaoxiaoqiong
33fa55bcb6 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-05-24 11:49:01 +08:00
xiaoxiaoqiong
643a99fdf1 fixed 增加自动登录,gitea注册 2022-05-24 11:48:56 +08:00