DavidZeng
/
forgeplus
forked from Gitlink/forgeplus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,749 Commits 27 Branches 0 Tags 566 MiB
Commit Graph

1749 Commits

Author SHA1 Message Date
Jasder 8f24f65820 ADD gem 'sidekiq-cron' 2021-01-08 18:03:51 +08:00
jasder 2f140d13f0 Merge pull request '用户可以查看其他用户的构建列表' (#10) from trustie_server into develop 
Reviewed-on: https://git.trustie.net/jasder/forgeplus/pulls/10
 2021-01-06 18:50:31 +08:00
moshenglv 9a66b48726 用户可以查看其他用户的构建列表 2021-01-06 18:47:39 +08:00
jasder 5cdfc4ba62 Merge pull request '解绑流程修改' (#9) from trustie_server into develop 
Reviewed-on: https://git.trustie.net/jasder/forgeplus/pulls/9
 2021-01-06 16:53:22 +08:00
moshenglv 06b8aab455 解绑时先判断是否是trustie提供服务器的场景 2021-01-06 16:45:18 +08:00
jasder 2abf1f0665 Merge pull request '【devops】trustie提供服务器后台代码' (#8) from trustie_server into develop 
Reviewed-on: https://git.trustie.net/jasder/forgeplus/pulls/8
 2021-01-06 15:38:29 +08:00
moshenglv cbe5b3afde 解绑时取消激活该用户的所有项目 2021-01-06 14:45:34 +08:00
Jasder 8f846ae29b FIX gitea user register service 2021-01-06 14:00:15 +08:00
moshenglv f7a5157788 使用trustie提供的服务器，需要多增加一条授权信息 2021-01-06 12:59:34 +08:00
moshenglv 910425ddb3 修改授权接口，当选择trustie服务器时，clientId使用创建drone的clientId 2021-01-05 16:40:09 +08:00
moshenglv e412b97003 修改授权接口 2021-01-05 15:04:01 +08:00
moshenglv 387a565fe3 自有服务器进行判断是否已经绑定云账号 2021-01-04 16:18:49 +08:00
moshenglv bab9174966 选trustie服务器解绑时删除drone用户 2021-01-04 14:57:28 +08:00
moshenglv 4aae60f3d8 打印调用drone创建用户接口日志 2021-01-04 09:49:42 +08:00
moshenglv 1108b298f0 绑定调用gitea接口，，错误，抛出异常 2021-01-04 09:41:04 +08:00
moshenglv 47093ffcb9 调用drone创建用户接口 2020-12-31 19:39:20 +08:00
moshenglv 3d332c75d6 连接ci数据库方法 2020-12-31 17:13:41 +08:00
moshenglv a84af1d743 根据用户选择的服务器类型创建不同的CI数据库连接 2020-12-31 17:07:10 +08:00
moshenglv 2b86c7eb95 修改turstie提供服务器，认证时调用drone url 2020-12-31 16:47:16 +08:00
Jasder 0476246585 Merge branch 'develop' 2020-12-30 15:05:24 +08:00
Jasder d62df0f087 ADD MuLan licenses 2020-12-30 15:05:07 +08:00
Jasder a80037ae8a FIX init db structrue and add records of roles 2020-12-30 15:00:15 +08:00
Jasder ad129db4e6 Merge branch 'develop' 2020-12-30 14:02:32 +08:00
Jasder fa98636eb9 FIX migrate bug 2020-12-30 14:02:21 +08:00
Jasder e127d12390 Merge branch 'develop' 2020-12-30 13:47:26 +08:00
Jasder 56965910a5 ADD column to cloud table 2020-12-30 13:47:00 +08:00
jasder 584ed2e852 NICE 2020-12-30 09:37:02 +08:00
Jasder 6b244b7b80 Merge branch 'develop' 2020-12-29 18:18:44 +08:00
Jasder 50021a278b FIX generate token bug for regitster api 2020-12-29 18:18:17 +08:00
Jasder 1420a47a5c FIX bug 2020-12-28 13:44:03 +08:00
Jasder 72d8af8d7b FIX update deploy file 2020-12-28 13:42:59 +08:00
moshenglv b5ab230a5c 删除调用drone创建用户接口 2020-12-24 10:40:42 +08:00
moshenglv 2666a95176 Merge branch 'master' of https://git.trustie.net/moshenglv/forgeplus into master 2020-12-24 10:38:16 +08:00
moshenglv a3724e80b9 增加trustie提供服务器流程。 
1、增加接口trustie_bind
2、根据server_type字段判断使用哪个数据库连接
 2020-12-24 10:35:38 +08:00
jasder e370c4df1b Update deploy file 2020-12-24 10:07:36 +08:00
jasder 9e5cf6c2f6 Update README.md 2020-12-24 10:00:39 +08:00
Jasder 32a52a5c7a Update model schemas 2020-12-23 15:48:07 +08:00
Jasder 01f79c81cc FIX code review for create pull request 2020-12-23 15:47:08 +08:00
Jasder ffb71512fc FIX code review for create pull request 2020-12-23 15:46:06 +08:00
moshenglv d70168d255 增加trustie提供服务器流程。 
1、增加接口trustie_bind
2、根据server_type字段判断使用哪个数据库连接
 2020-12-18 13:14:30 +08:00
Jasder 6cbaf410b2 FIX Grammatical errors 2020-12-10 18:05:33 +08:00
Jasder 5a25ffe101 FIX get repository protected branches bug 2020-12-08 16:48:28 +08:00
Jasder 61c8e41136 FIX log writing failed. xE6 from ASCII-8BIT to UTF-8 2020-12-07 16:04:13 +08:00
Jasder 087ad08303 Merge branch 'develop' 2020-12-07 10:29:37 +08:00
Jasder a4a315ea32 FIX bug 2020-12-07 10:29:18 +08:00
Jasder 0c98d13dbe Merge branch 'develop' 2020-12-07 10:12:49 +08:00
Jasder 07caa77f97 FIX code review 2020-12-07 10:06:08 +08:00
Jasder a357ea3ecd Merge branch 'develop' 2020-12-06 21:48:47 +08:00
Jasder 4c980b5774 FIX create protected branch params 2020-12-04 18:15:48 +08:00
Jasder 539b4a10a0 Upate README.md 2020-12-04 18:15:19 +08:00