anph
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,862 Commits 48 Branches 16 Tags 710 MiB
Commit Graph

138 Commits

Author SHA1 Message Date
xiaoxiaoqiong 3f94cf3637 登录同步gitea密码 2022-04-11 18:07:07 +08:00
xiaoxiaoqiong cee09d9f8f Merge branch 'dev_military_server_local' into dev_jk_server 
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/concerns/login_helper.rb
#	app/controllers/users_controller.rb
#	config/routes.rb
 2022-03-24 16:35:04 +08:00
xiaoxiaoqiong 521a1a2c8a autologin_action可配置 2022-03-22 15:18:09 +08:00
xiaoxiaoqiong b1c3d62e41 fixed 固定token key 2022-02-23 18:28:16 +08:00
xiaoxiaoqiong c1ea0232bb fixed注册gitea 2022-02-22 13:48:37 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 5d45b24299 fix: devops return result changed 2022-01-14 10:55:53 +08:00
xiaoxiaoqiong 01bf13ddd9 fixed 手机号注册失败 2021-12-25 20:22:46 +08:00
xiaoxiaoqiong 293121ab91 其他平台用户注册 2021-12-14 14:41:59 +08:00
jasder 03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
jasder 1008f17849 FIX 调整注册接口 2021-11-02 13:39:45 +08:00
jasder f5ffd978ac FIX delete some file 2021-09-09 14:35:26 +08:00
jasder c627ea6c19 FIX migration project accelerator's bug 2021-05-17 17:14:55 +08:00
jasder 1277e717ff ADD github gitlab镜像加速器 2021-04-29 18:35:57 +08:00
vilet.yy 223755a965 fix: languages filter 0.0% 2021-03-19 18:36:55 +08:00
jasder d91e8dcbfe Merge branch 'dev_military' of https://git.trustie.net/jasder/forgeplus into dev_military 2021-03-05 15:38:06 +08:00
jasder 0c2507b1e9 FIX valid user before register action 2021-03-05 15:37:41 +08:00
jasder 50928f82c0 FIX valid user before register action 2021-03-05 15:36:26 +08:00
vilet.yy cc978c8dea [FIX]merge from develop 2021-03-01 13:59:30 +08:00
viletyy f094fe1799 [ADD]组织项目相关 2021-02-06 14:27:47 +08:00
Jasder b552e29aa3 ADD forge host and main web host for setting api 2021-02-04 11:43:11 +08:00
Jasder 21424a23f2 FIX change host 2021-02-04 11:12:51 +08:00
Jasder 0f01abd45f Merge branch 'develop' into dev_military 2021-01-28 15:21:43 +08:00
victor 6c77b73ec6 创建多条流水线、模板管理 2021-01-26 17:15:53 +08:00
jasder 122667c67c Merge pull request '【devops】可视化创建流水线' (#13) from trustie-pipeline into develop 
Reviewed-on: https://git.trustie.net/jasder/forgeplus/pulls/13
 2021-01-20 16:01:21 +08:00
Jasder 0adcbaa19f ADD repository languages percentage api 
(cherry picked from commit efa99e0f06)
 2021-01-20 14:30:41 +08:00
moshenglv ab4af170fb 连接ci数据库名修改，根据repo 2021-01-20 13:52:30 +08:00
Jasder efa99e0f06 ADD repository languages percentage api 2021-01-19 16:21:31 +08:00
Jasder 5b261d6e81 FIX merge develop branch 2021-01-12 17:42:44 +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
Jasder 0794f77a87 Merge branch 'develop' into dev_military 2021-01-06 14:00:51 +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
Jasder e5a46a242f FIX register with validate email 2021-01-06 11:03:00 +08:00
Jasder 4ddc60a1c3 FIX user register bug 2021-01-06 10:44:20 +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 2b86c7eb95 修改turstie提供服务器，认证时调用drone url 2020-12-31 16:47:16 +08:00
jasder 584ed2e852 NICE 2020-12-30 09:37:02 +08:00
Jasder 132af875bc Merge branch 'master' into dev_military_license 2020-12-29 18:19:07 +08:00
Jasder 50021a278b FIX generate token bug for regitster api 2020-12-29 18:18:17 +08:00
Jasder 837aa1ea9e FIX Merge master branch 2020-12-25 15:10:50 +08:00
moshenglv a3724e80b9 增加trustie提供服务器流程。 
1、增加接口trustie_bind
2、根据server_type字段判断使用哪个数据库连接
 2020-12-24 10:35:38 +08:00
Jasder 6cbaf410b2 FIX Grammatical errors 2020-12-10 18:05:33 +08:00
Jasder ba14fce0bd ADD string to strip when crate ci cloud account 2020-11-27 10:19:11 +08:00