Commit Graph

1252 Commits

Author SHA1 Message Date
sylor_huang@126.com c4b9ef79d1 Change Issues Clean Routes 2020-09-18 17:16:37 +08:00
Jasder 8f279753cc FIX code bug 2020-09-18 16:50:35 +08:00
Jasder 7789c30e5b FIX ci db bug 2020-09-18 16:44:38 +08:00
Jasder 467f278de5 ADD ci datbase config 2020-09-18 16:40:54 +08:00
Jasder 0467119605 FIX ci db bug 2020-09-18 15:46:36 +08:00
Jasder b74d43083e FIX 解决ci 数据库安全性问题 2020-09-18 15:26:14 +08:00
Jasder 12bef27260 Merge branch 'dev_trustie' into dev_devops 2020-09-11 23:24:50 +08:00
Jasder e7ff26faa5 FIX code bug 2020-09-11 23:20:18 +08:00
Jasder b785105730 FIX get sub entries bug 2020-09-11 23:04:16 +08:00
Jasder bb98dad64c FIX educoder auto register 2020-09-11 22:40:32 +08:00
Jasder 1e823aef97 FIX ci log data with null bug 2020-09-11 17:08:40 +08:00
Jasder 5b8b74b808 ADD ci authorue column for get user info api 2020-09-11 16:35:08 +08:00
Jasder fae4907fd1 FIX set ci repo default value 2020-09-11 16:34:19 +08:00
Jasder 868ffbabac FIX ci query log with 404 bug 2020-09-11 15:05:03 +08:00
Jasder f9ec41f9bc FIX ci repo asstassion 2020-09-11 10:41:27 +08:00
Jasder 2e0d76575c FIX repo instance method's bug 2020-09-11 10:13:54 +08:00
Jasder 9568523286 FIX user bug 2020-09-11 10:00:29 +08:00
Jasder f3d6244fee FIX ci certification bug 2020-09-11 09:55:21 +08:00
Jasder ad43c6975b ADD 解决ci端用户授权后,项目同步失败的问题 2020-09-10 18:00:37 +08:00
Jasder 6419453fca FIX ci code review 2020-09-10 16:01:24 +08:00
Jasder 9b1f95bf08 ADD builds authorization 2020-09-10 11:52:54 +08:00
Jasder 217dfc03b2 ADD ci namespace modle associations 2020-09-10 10:53:12 +08:00
Jasder d802b8aba4 Merge branch 'dev_trustie' into dev_devops 2020-09-09 10:35:11 +08:00
Jasder 91966192e1 FIX 处理gitea版本库中获取子目录404时的容错 2020-09-09 10:33:49 +08:00
Jasder be6ff6a043 FIX update query ci user and ci repo method 2020-09-09 09:57:44 +08:00
Jasder 0edac45e82 FIX 解决自动触发构建失败的问题 2020-09-09 09:17:11 +08:00
Jasder 5dfc6504a0 ADD sync ci user repos api 2020-09-08 15:29:38 +08:00
Jasder 3290609bbc FIX request devops languages api authoure 2020-09-08 15:29:19 +08:00
Jasder e877c2cde6 FIX code review 2020-09-07 16:25:06 +08:00
Jasder 2b470eed50 Delete some log info 2020-09-07 16:05:03 +08:00
Jasder 4a20caed0e FIX gitea webhook bug 2020-09-07 15:11:43 +08:00
Jasder 6985699989 Upage ci certifacate 2020-09-07 14:44:26 +08:00
Jasder c875451ac1 Merge branch 'dev_trustie' into dev_devops 2020-09-07 13:50:46 +08:00
Jasder 061f4cae45 FIX educoder account oauth 2020-09-07 13:50:26 +08:00
Jasder a8821de85f Update gitea hooks api 2020-09-07 11:23:09 +08:00
Jasder 5cc5404915 FIX . 2020-09-04 18:20:50 +08:00
Jasder 401efd7c9b FIX code bug 2020-09-04 18:16:38 +08:00
Jasder 9613f4c485 FIX test gitea create webhook 2020-09-04 17:51:39 +08:00
Jasder e77475e26a ADD ci cloud account authenticate url 2020-09-04 17:35:29 +08:00
Jasder 81ec264483 Update destroy ci_user attassion 2020-09-04 17:26:37 +08:00
Jasder 0777db4ab4 FIX 2020-09-04 17:11:02 +08:00
Jasder 5c2bb71e57 FIX ci activate repo's bug 2020-09-04 16:57:23 +08:00
Jasder e0dac72114 FIX ci repos dependent destroy bug 2020-09-04 16:45:38 +08:00
Jasder 48350dc6f2 FIX delete webhook for bind ci service 2020-09-04 16:26:00 +08:00
Jasder 930f8195b7 FIX project search wrong 2020-09-04 16:24:20 +08:00
Jasder 15c92597a9 FIX code bug 2020-09-04 16:21:06 +08:00
Jasder f7d83acafe ADD webhook manager 2020-09-04 16:17:18 +08:00
Jasder eb2f1f46e0 ADD create gitea webhook api 2020-09-04 15:46:07 +08:00
Jasder 8c908a35ac FIX bug 2020-09-04 10:28:41 +08:00
Jasder 32ec60bbe3 FIX 完善ci服务的解绑流程 2020-09-04 10:17:44 +08:00
Jasder 74b2a5b021 FIX rename ucloud view dir 2020-09-03 17:10:23 +08:00
Jasder b31a11302c FIX devops admin bug 2020-09-03 17:05:38 +08:00
Jasder 562d0b7b07 ADD 个人中心添加devops管理功能 2020-09-03 15:52:54 +08:00
Jasder 731c06185b Merge branch 'dev_trustie' into dev_devops 2020-09-03 15:34:05 +08:00
Jasder 6ec599a946 FIX forge登录时,修改同步trustie平台登录接口请求方法 2020-09-01 15:51:03 +08:00
Jasder cd933f2031 FIX CODE BUG 2020-09-01 15:33:31 +08:00
Jasder 57ee5c5397 Merge branch 'dev_trustie' into dev_devops 2020-09-01 15:23:37 +08:00
Jasder 318c9487fb FIX 解决trustie和forge同步登录登出的问题 2020-09-01 15:23:02 +08:00
Jasder 003db1405d Merge branch 'dev_trustie' into dev_devops 2020-08-29 12:07:37 +08:00
Jasder ef4578286f FIX 解决forked项目删除后,fork user没有关联删除的bug 2020-08-29 12:07:06 +08:00
Jasder dc3ec48b8c FIX educoder author bug 2020-08-29 11:57:50 +08:00
Jasder 1290b3446f FIX update_column bug 2020-08-28 11:50:14 +08:00
Jasder 903103ec5d FIX ci active repo bug 2020-08-28 11:40:29 +08:00
Jasder b9a57be67d FIX code bug 2020-08-28 10:56:04 +08:00
Jasder f47eae3aeb FIX app/views/projects/ci_authorize.json.jbuilder 2020-08-28 10:46:23 +08:00
Jasder 27b6a251af FIX . 2020-08-28 10:43:32 +08:00
Jasder 30ff51f93b FIX devops author url 2020-08-28 10:38:39 +08:00
Jasder b75896821f FIX 优化ci初始化流程 2020-08-28 10:25:08 +08:00
Jasder b26c2f273f FIX build time bug 2020-08-27 16:01:10 +08:00
Jasder 0461c2735b Merge branch 'dev_trustie' into dev_devops 2020-08-27 15:10:25 +08:00
Jasder c6a31cbda8 FIX delete hash merge code 2020-08-27 15:10:11 +08:00
Jasder f09a9bdedc Merge branch 'dev_trustie' into dev_devops 2020-08-27 15:05:24 +08:00
Jasder 9823b03099 FIX hash merge bug 2020-08-27 15:05:09 +08:00
Jasder 43a8576089 Merge branch 'dev_trustie' into dev_devops 2020-08-27 14:44:26 +08:00
Jasder 79c557bd68 FIX 修复版本库在线创建文件时,commiter信息错误的bug 2020-08-27 14:43:44 +08:00
Jasder 016971287c ADD open_devops for repositores show api 2020-08-27 11:50:17 +08:00
Jasder 82c4f4f38a ADD build error status 2020-08-27 11:39:11 +08:00
Jasder 2866c060c7 FIx code review 2020-08-26 16:24:51 +08:00
Jasder 518e966a87 FIX update trustie-pileline 2020-08-26 16:23:59 +08:00
Jasder 8c9c085259 ADD cloud account id 2020-08-26 15:14:00 +08:00
Jasder 72cacb72a6 FIX devops author api 2020-08-26 15:02:02 +08:00
Jasder 1e99e87228 FIX delete 'docker rm -f' command 2020-08-26 14:34:32 +08:00
Jasder 21fa22ed21 FIX 2020-08-26 12:02:51 +08:00
Jasder fc7b714d4c FIX delete project_id with create cloud_account 2020-08-26 11:57:47 +08:00
Jasder aac6df8790 FIX time count bug 2020-08-26 10:46:54 +08:00
Jasder 7e9d5a9acb FIX code bug 2020-08-26 10:45:21 +08:00
Jasder d16713e611 FIX buid time bug 2020-08-26 10:43:47 +08:00
Jasder 087f81a6aa ADD duration time for stage and step 2020-08-25 17:59:32 +08:00
Jasder c54723a6c6 FIX step bug 2020-08-25 17:14:55 +08:00
Jasder 21192d70b6 FIX stage bug 2020-08-25 17:09:44 +08:00
Jasder 5375c3ec71 ADD build status with killed 2020-08-25 17:01:03 +08:00
Jasder 66efdcc1b6 FIX build's number params 2020-08-25 16:39:31 +08:00
Jasder ec7becc26e FIX user search cloud account's bug 2020-08-25 16:34:13 +08:00
Jasder 1617a541fe FIX code review 2020-08-25 15:59:53 +08:00
Jasder 3e25a7b28c FIX code review 2020-08-25 15:49:47 +08:00
Jasder 41f876a714 FIX build finished time bug 2020-08-25 15:48:41 +08:00
Jasder 1ea9e420be ADD paginate for builds api 2020-08-25 15:43:30 +08:00
Jasder 4932eae285 ADD branch and sha for builds api 2020-08-25 14:25:42 +08:00
Jasder 405e5b5d3d FIX bug 2020-08-25 11:05:46 +08:00
sylor_huang@126.com e23ce05b1b Fixed: Issues2 2020-08-24 15:09:16 +08:00
sylor_huang@126.com 200cb70f4b Fixed: Issues 2020-08-24 15:06:05 +08:00
sylor_huang@126.com 46801284aa Test Project Validate Failed15 2020-08-24 14:28:30 +08:00
sylor_huang@126.com 7e7ab71231 Test Project Validate Failed14 2020-08-24 14:20:48 +08:00
sylor_huang@126.com 79bc2655b7 Test Project Validate Failed13 2020-08-24 14:19:32 +08:00
sylor_huang@126.com 5a065d83b7 Test Project Validate Failed12 2020-08-24 14:17:23 +08:00
sylor_huang@126.com 3586952a89 Test Project Validate Failed1 2020-08-24 14:16:11 +08:00
sylor_huang@126.com 72feacecbb Test Project Validate Failed 2020-08-24 14:12:59 +08:00
Jasder 6d0eb74683 FIX educoder platform register bug when mail exists 2020-08-22 13:24:58 +08:00
Jasder 8abf748778 FIX bug 2020-08-21 16:25:13 +08:00
Jasder 8758ec3197 Update trustie pipeline api 2020-08-21 16:06:47 +08:00
Jasder c1e6792f29 FIX cloud account bug 2020-08-21 15:26:42 +08:00
Jasder ae9d857d7f FIX ci server 2020-08-21 14:53:48 +08:00
Jasder e7a0bc7e0f FIX code bug 2020-08-21 10:46:37 +08:00
Jasder 137e780db4 FIX . 2020-08-21 10:15:26 +08:00
Jasder 3aa0cb70fe Merge branch 'dev_devops' of http://git.trustie.net/jasder/forgeplus into dev_devops 2020-08-20 18:38:05 +08:00
Jasder 7c1ab2cddf FIX 重构ci流程 2020-08-20 18:37:53 +08:00
sylor_huang@126.com 957df36fb1 Merge branch 'dev_trustie' into dev_devops 2020-08-20 18:04:53 +08:00
sylor_huang@126.com 701b56ea90 Merge branch 'dev_trustie' of http://git.trustie.net/jasder/forgeplus into dev_trustie 2020-08-20 18:03:43 +08:00
sylor_huang@126.com 81c29e4cc2 Add PR identifier 2020-08-20 18:03:30 +08:00
Jasder 89b2e263ae FIX devops builds api bug 2020-08-19 18:19:27 +08:00
Jasder ac2d2b842d Merge branch 'dev_trustie' into dev_devops 2020-08-19 17:13:48 +08:00
Jasder 6ea4cacc9a fix trustie_related_projects 接口添加项目相关链接 2020-08-19 16:24:24 +08:00
Jasder 9b25b7a9e6 FIX ci drone server database 2020-08-18 16:40:39 +08:00
Jasder 5ac6133aef FIX ci drone server connect database 2020-08-18 09:23:23 +08:00
Jasder 3a18772de0 Merge branch 'dev_trustie' into dev_devops 2020-08-18 09:07:59 +08:00
Jasder a36072e8f1 Delete mail validate for bind action 2020-08-18 09:07:16 +08:00
Jasder a9012b4c53 Merge branch 'dev_trustie' into dev_devops 2020-08-17 18:08:41 +08:00
Jasder 806fa686a6 FIX OpenUser's bug 2020-08-17 18:08:18 +08:00
Jasder 90693d4745 Merge branch 'dev_trustie' into dev_devops 2020-08-17 17:48:07 +08:00
Jasder 44441ec215 FIX mail bug 2020-08-17 17:47:47 +08:00
Jasder ad229081f0 Merge branch 'dev_trustie' into dev_devops 2020-08-17 17:41:39 +08:00
Jasder 9f85b8da8e FIX query bug 2020-08-17 17:41:01 +08:00
Jasder 7db195147e FIX educoder帐号同步流程优化(支持邮箱自动授权) 2020-08-17 17:30:15 +08:00
Jasder a4d8338cb5 ADD ci database port 2020-08-17 14:29:09 +08:00
Jasder af220cfffc FIX config drone database 2020-08-17 14:22:26 +08:00
Jasder 7bb43700b4 ADD namespace ci for model 2020-08-17 11:22:53 +08:00
Jasder 7b8bb996a6 Merge branch 'dev_trustie' into dev_devops 2020-08-17 11:14:35 +08:00
Jasder c68c8ed089 FIX remote regitster bug 2020-08-16 13:48:48 +08:00
Jasder 086ebc34b2 FIX login_hepler set cookie's bug 2020-08-16 02:26:21 +08:00
Jasder c40777be2b FIX debug token 2020-08-16 00:54:22 +08:00
Jasder 480cfb66b1 Merge branch 'dev_devops' of http://git.trustie.net/jasder/forgeplus into dev_devops 2020-08-15 19:57:35 +08:00
Jasder b233586779 FIX merge 2020-08-15 19:57:20 +08:00
Jasder a9a0cab7d1 Merge branch 'dev_trustie' of http://git.trustie.net/jasder/forgeplus into dev_trustie 2020-08-15 19:53:05 +08:00
Jasder 7a3f8cf47f FIX migrate api bug 2020-08-15 19:52:58 +08:00
sylor_huang@126.com 8fd167b578 Merge branch 'dev_trustie' into dev_devops 2020-08-15 15:04:24 +08:00
sylor_huang@126.com 1bfcc466fe change 2020-08-15 15:04:09 +08:00
sylor_huang@126.com 09802819b8 Merge branch 'dev_trustie' into dev_devops 2020-08-15 14:50:12 +08:00
sylor_huang@126.com fae9df56a4 cahnge 2020-08-15 14:49:52 +08:00
sylor_huang@126.com 2979eaaeb4 Merge branch 'dev_trustie' into dev_devops 2020-08-15 14:48:42 +08:00
sylor_huang@126.com 531b66e862 Change 2020-08-15 14:48:12 +08:00
sylor_huang@126.com bc8240b772 Merge branch 'dev_trustie' into dev_devops 2020-08-15 14:35:52 +08:00
sylor_huang@126.com b1d974c362 Change 2020-08-15 14:35:31 +08:00
sylor_huang@126.com 372687e509 Merge branch 'dev_trustie' into dev_devops 2020-08-15 13:49:52 +08:00
sylor_huang@126.com e092c1f222 Change 2020-08-15 13:49:36 +08:00
sylor_huang@126.com a7b096d00e Merge branch 'dev_trustie' into dev_devops 2020-08-15 13:36:03 +08:00
sylor_huang@126.com 5f3f6748f2 Change 2020-08-15 13:34:32 +08:00
sylor_huang@126.com 2267872076 Chnage 2020-08-15 13:30:44 +08:00
sylor_huang@126.com 929b56629c Change 2020-08-15 13:28:22 +08:00
sylor_huang@126.com 2154892a0b Merge branch 'dev_trustie' into dev_devops 2020-08-15 13:27:32 +08:00
sylor_huang@126.com 0aa46815f2 Change Project Id 2020-08-15 13:27:13 +08:00
Jasder a8522edaa9 Merge branch 'dev_trustie' of http://git.trustie.net/jasder/forgeplus into dev_trustie 2020-08-15 13:24:52 +08:00
Jasder ebce182b7e Merge branch 'dev_change_route' into dev_trustie 2020-08-15 13:24:29 +08:00
sylor_huang@126.com 0af359ec0c Change 2020-08-15 13:21:33 +08:00
sylor_huang@126.com a0d287b1df Change 2020-08-15 12:50:04 +08:00
sylor_huang@126.com 466bdedfcd Change 2020-08-15 12:40:31 +08:00
sylor_huang@126.com e1c49c0ba8 Change 2020-08-15 12:38:25 +08:00
sylor_huang@126.com aa0f7ff873 Change 2020-08-15 12:37:26 +08:00
sylor_huang@126.com 5aff092a35 Change 2020-08-15 12:35:56 +08:00
Jasder fb733722d6 Merge branch 'dev_change_route' into dev_devops 2020-08-15 11:06:04 +08:00
Jasder ec43c03f08 FIX bug 2020-08-15 11:05:20 +08:00
Jasder 8b9f0a9f06 FIX projects fork users bug 2020-08-15 10:59:29 +08:00
Jasder 90f14d2051 FIX projects fork users bug 2020-08-15 10:58:56 +08:00
Jasder bd9f32cfaa Merge branch 'dev_change_route' into dev_devops 2020-08-15 10:26:47 +08:00
Jasder b7b096d6d7 FIX password length validate 2020-08-15 10:26:30 +08:00
Jasder dac91f9a0c Merge branch 'dev_change_route' into dev_devops 2020-08-14 23:25:10 +08:00
Jasder 0cd790ecac fix js redirect 2020-08-14 23:24:54 +08:00
Jasder 0c64b36fab FIX merge 2020-08-14 22:17:09 +08:00
Jasder c4a92fe4a4 FIX login bug 2020-08-14 22:16:24 +08:00
Jasder 775c27a45b FIX login bug 2020-08-14 22:14:59 +08:00
Jasder 10adc42257 Merge branch 'dev_change_route' into dev_devops 2020-08-14 22:05:35 +08:00
Jasder 17da5fad38 ADD log 2020-08-14 22:05:22 +08:00
Jasder 58d0044764 Merge branch 'dev_change_route' into dev_devops 2020-08-14 22:00:52 +08:00
Jasder 17183d8769 FIX 2020-08-14 22:00:37 +08:00
Jasder 652654e606 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:57:10 +08:00
Jasder 675c380967 FIX 2020-08-14 21:56:16 +08:00
Jasder f7db9c0892 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:53:25 +08:00
Jasder c38b073715 FIX validat bug 2020-08-14 21:53:11 +08:00
Jasder 07edd5f8b4 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:49:47 +08:00
Jasder 93dabf9f06 FIX 2020-08-14 21:49:33 +08:00
Jasder 94bf6f99cc Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:43:53 +08:00
Jasder bf5937fc85 FIX logger 2020-08-14 21:43:39 +08:00
Jasder 840e048d77 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:32:09 +08:00
Jasder 04ae2da5bc FIX config 2020-08-14 21:31:46 +08:00
Jasder 9317e21dd5 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:17:50 +08:00
Jasder e11a32e113 FIX include jquery 2020-08-14 21:17:28 +08:00
Jasder 39424ec8da Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:09:12 +08:00
Jasder 86bbefd036 FIX bug 2020-08-14 21:08:59 +08:00
Jasder b2a6630e15 Merge branch 'dev_change_route' into dev_devops 2020-08-14 19:47:19 +08:00
Jasder 2199258f8e FIX bug 2020-08-14 19:47:02 +08:00
Jasder 06d0065173 Merge branch 'dev_change_route' into dev_devops 2020-08-14 18:40:32 +08:00