Commit Graph

389 Commits

Author SHA1 Message Date
vilet.yy 12c252ea10 fix: merge from hh_develop 2021-06-04 18:36:33 +08:00
jasder fcf8033fbf FIX 解决镜像项目手动同步镜像不成功的问题 2021-06-03 17:04:22 +08:00
viletyy c58b074173 fix: init project 2021-06-03 11:27:13 +08:00
vilet.yy 7dc21ff388 add: update user more info 2021-06-03 11:27:13 +08:00
vilet.yy 86f0f2051d add: update user_info 2021-06-03 11:27:12 +08:00
vilet.yy 2410f5bbc0 add: user statistics 2021-06-03 11:27:12 +08:00
vilet.yy ea79772bd2 add: user pinned projects 2021-06-03 11:27:12 +08:00
vilet.yy 496867cac7 add: update user more info 2021-06-03 10:19:33 +08:00
vilet.yy 0b450c0c5f add: update user_info 2021-05-31 18:39:49 +08:00
vilet.yy 1df95eab4d add: user statistics 2021-05-28 15:36:05 +08:00
vilet.yy c2449d59af add: user pinned projects 2021-05-27 14:23:59 +08:00
jasder 77076c60a6 ADD issue、pull、milestone钩子,自动触发项目的更新时间 2021-05-26 17:37:13 +08:00
jasder e716dba249 FIX query project members api bug 2021-05-24 17:05:06 +08:00
jasder 2f9d583fac FIX add nickname lastname query conditions for list users api 2021-05-17 16:57:46 +08:00
jasder dac07bcae0 ADD 页面置顶功能、帮助文档快速入口 2021-05-14 16:23:19 +08:00
jasder 2cca2c756e ADD recommend organizations api 2021-05-13 14:52:07 +08:00
jasder f470807225 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-05-08 14:23:05 +08:00
vilet.yy e490ddb1f5 add: sync mirror project remove pulls module 2021-05-07 17:27:37 +08:00
jasder b162b3357a FIX get mirror url bug 2021-05-07 14:06:40 +08:00
vilet.yy fc5876fc32 add: team valid 2021-05-06 18:22:30 +08:00
jasder b22330d146 Merge branch 'sync_develop' into develop 2021-04-29 23:23:25 +08:00
jasder b2e338732d FIX 解决合并请求的权限问题 2021-04-29 23:23:16 +08:00
jasder d71272146f Merge branch 'sync_develop' into develop 2021-04-29 23:18:56 +08:00
jasder c56f0ca7fc FIX 解决合并请求的权限问题 2021-04-29 23:17:55 +08:00
jasder f222cc6e4f FIX bug
个人名下所有仓库加载接口调整
2021-04-29 19:18:58 +08:00
jasder 0133ec24ca FIX pr merge bug 2021-04-29 18:48:54 +08:00
jasder 03e54f9b3d Merge branch 'sync_develop' into develop 2021-04-29 18:37:09 +08:00
jasder 1277e717ff ADD github gitlab镜像加速器 2021-04-29 18:35:57 +08:00
vilet.yy fffe57a211 fix: mirror project permission error 2021-04-29 18:09:39 +08:00
vilet.yy c14c92ac11 fix: pull_request permit develop create pr 2021-04-29 10:32:49 +08:00
vilet.yy ea42b0d6ed fix: pull_request can not select reporter and compare userinfo lose 2021-04-28 20:10:21 +08:00
vilet.yy 65d51e8578 add: project operate add organization team users 2021-04-28 15:15:45 +08:00
vilet.yy 1d81548eb6 fix 2021-04-26 11:32:59 +08:00
vilet.yy 1e081b5a3e add: transfer project 2021-04-25 18:41:13 +08:00
jasder d07543111a FIX code bug 2021-04-22 16:42:50 +08:00
jasder 908cda56f3 ADD users/hovercard api 2021-04-22 16:36:40 +08:00
jasder 002c773746 FIX code bug 2021-04-20 19:06:31 +08:00
jasder 45f05c9fc4 FIX render commmiter and author avatar bug 2021-04-20 18:58:14 +08:00
vilet.yy f75827bcf0 fix: org not need create member 2021-04-19 18:37:30 +08:00
vilet.yy f0c4d1226b fix: org not need create member 2021-04-19 18:37:30 +08:00
vilet.yy 3a47c61010 add: team nickname 2021-04-19 18:37:30 +08:00
jasder de6ae5b720 Upate models Schema Information 2021-04-19 18:36:02 +08:00
jasder 21befb6486 FIX auto generate avatar bug 2021-04-19 17:28:57 +08:00
jasder 002ae9f327 ADD auto generate user avatar 2021-04-19 15:06:56 +08:00
vilet.yy 1fe9ea126a fix: permission with organization 2021-04-13 11:53:06 +08:00
vilet.yy cf224bc9fe add: project menulist resources 2021-04-07 11:29:44 +08:00
vilet.yy d6c3bcfaf1 add: org add nickname 2021-04-07 11:29:44 +08:00
vilet.yy a66e5b876d fix 2021-04-07 11:29:44 +08:00
vilet.yy b11fd350da fix: project permission 2021-04-07 11:29:44 +08:00
jasder 3869529620 Update setting api 2021-03-31 09:49:05 +08:00
jasder aa23762b2f FIX update setting api for nav bar url 2021-03-22 18:02:12 +08:00
vilet.yy a14459da50 add: project menu list 2021-03-17 11:52:36 +08:00
vilet.yy b43926f69f add: new project detail 2021-03-15 19:01:35 +08:00
jasder 11350bb76f Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-03-01 10:02:35 +08:00
vilet.yy 70922b81db [FIX]watcher type error 2021-02-25 11:52:24 +08:00
jasder 50d81b2490 FIX schema 2021-02-09 11:49:47 +08:00
viletyy ec1acde99a [FIX]show teams, org name valid message 2021-02-06 15:49:56 +08:00
viletyy 54204d4db8 [ADD]org team search, project teams add\remove, org can create field
[FIX]
2021-02-06 15:49:55 +08:00
viletyy ddaca5bafc [ADD]organization add num_teams 2021-02-06 15:49:54 +08:00
viletyy 152e301bf3 [ADD]search is_member is_admin 2021-02-06 15:49:54 +08:00
viletyy c6269f44ee [FIX]add user organization count 2021-02-06 15:49:54 +08:00
viletyy fef43caf4c [ADD]组织项目相关 2021-02-06 15:49:53 +08:00
viletyy 289d1877d6 [ADD]组织、组织团队 2021-02-06 15:49:53 +08:00
viletyy 0c58447afb [FIX]组织上传头像支持多种格式、项目详情返回拥有者类型
[FIX]

[FIX]
2021-02-06 15:49:52 +08:00
viletyy 3f73484596 [FIX]一些筛选以及创建最大项目数量验证
[FIX]
2021-02-06 15:49:49 +08:00
viletyy f094fe1799 [ADD]组织项目相关 2021-02-06 14:27:47 +08:00
viletyy 1dc43a23b7 [FIX]为组织创建项目做准备 2021-02-06 14:27:47 +08:00
viletyy 7f309edc91 [ADD]组织、组织团队 2021-02-06 14:27:47 +08:00
viletyy 2434ca9681 [ADD]组织模块相关代码 2021-02-06 14:27:47 +08:00
viletyy c00336e7b5 [ADD]统计平台概况
[FIX]更改请求参数

[FIX]

[ADD]rank statistic

[FIX]
2021-02-06 11:15:25 +08:00
Jasder be57c75166 ADD schema for pipeline model 2021-02-02 16:42:48 +08:00
victor b18fbd698f Merge branch 'develop' into trustie-pipeline
# Conflicts:
#	app/models/ci/pipeline.rb
2021-02-02 14:41:23 +08:00
victor 8d3838614f FIX pipeline model schma
# Conflicts:
#	app/models/ci/pipeline.rb
2021-02-02 14:32:02 +08:00
victor 6c77b73ec6 创建多条流水线、模板管理 2021-01-26 17:15:53 +08:00
Jasder dcda8671b3 FIX pipeline model schma 2021-01-20 17:00:19 +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 1c59832abf FIX get assignees bug in issues
(cherry picked from commit e9223c53de)
2021-01-20 14:30:39 +08:00
Jasder d2e2793d29 FIX pull request bug
(cherry picked from commit 2b140d6f7c)
2021-01-20 14:29:52 +08:00
Jasder 8c8d9f64c4 ADD sync repo updated at time
(cherry picked from commit 8c6df359a5)
2021-01-20 14:28:56 +08:00
moshenglv 1001d10017 流水线字段校验 2021-01-19 14:00:22 +08:00
moshenglv 05416339e5 流水线查询返回字段修改 2021-01-19 11:10:47 +08:00
Jasder e9223c53de FIX get assignees bug in issues 2021-01-18 15:28:20 +08:00
moshenglv 2d99713cd0 流水线增加用户字段 2021-01-18 09:32:23 +08:00
moshenglv cb6c4b1e3f 阶段新增、删除、查询步骤接口修改 2021-01-12 17:40:42 +08:00
Jasder 2b140d6f7c FIX pull request bug 2021-01-12 15:45:18 +08:00
moshenglv bcb4e78829 修改模板查询相关接口 2021-01-12 13:54:11 +08:00
moshenglv 77529319a1 可视化创建流水线后端代码 2021-01-12 10:23:26 +08:00
Jasder 8c6df359a5 ADD sync repo updated at time 2021-01-08 18:07:48 +08:00
moshenglv cbe5b3afde 解绑时取消激活该用户的所有项目 2021-01-06 14:45:34 +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
moshenglv a3724e80b9 增加trustie提供服务器流程。
1、增加接口trustie_bind
2、根据server_type字段判断使用哪个数据库连接
2020-12-24 10:35:38 +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 6a8ae5234b ADD protected branch Features 2020-12-03 15:24:40 +08:00
Jasder 17e182788f FIX bug 2020-11-24 17:55:12 +08:00
Jasder 60ac66ebe3 ADD db schema in models 2020-11-23 15:35:03 +08:00
Jasder 0ca699cc49 FIX find educoder project's bug 2020-11-11 10:14:41 +08:00
Jasder 70f7b59349 Update search projects api 2020-10-30 17:20:06 +08:00
Jasder 1bc935ffd5 FIX code review and user cache 2020-10-30 15:47:09 +08:00
Jasder 58f8d60646 FIX 版本库兼容euducoder平台数据 2020-10-22 18:00:31 +08:00
Jasder 9477555ebd FIX merge dev_devops branch 2020-10-21 11:56:30 +08:00
Jasder 99f67cf3a7 FIX merge 2020-10-21 11:54:22 +08:00
Jasder 495dc0d2e1 FIX query project 2020-10-21 11:53:52 +08:00
Jasder e3d9dae8fd Update projects sime api with statics 2020-10-21 11:45:55 +08:00
Jasder 2f7b6c9b75 FIX bug 2020-10-19 23:41:05 +08:00
Jasder a63d675a92 FIX 同步educoder平台实训项目放入job中执行 2020-10-19 23:39:44 +08:00
Jasder 7f685e4119 FIX 完善同步educoder平台实训 2020-10-19 23:08:17 +08:00
Jasder 2eef143251 ADD 同步educoder平台实训项目 2020-10-19 22:59:41 +08:00
Jasder edcb9f863c FIX ci certification bug 2020-10-16 09:47:36 +08:00
Jasder e430645304 FIX ci connection database bug 2020-10-16 09:42:08 +08:00
Jasder 28d6aa2dda ADD drone user oauth 2020-10-13 19:49:52 +08:00
Jasder b8cace558b Merge branch 'dev_trustie' into dev_devops 2020-10-04 17:33:21 +08:00
Jasder 0faa750450 ADD project detail api 2020-10-04 17:32:37 +08:00
Jasder 705ae1020b FIX merge dev_trustie branch 2020-10-04 12:05:53 +08:00
Jasder c6a7719d4d ADD recommand projects api 2020-10-04 12:01:26 +08:00
Jasder 2636923c9b FIX merge 2020-09-29 11:53:41 +08:00
Jasder 3621f4ff48 ADD gitea databse config 2020-09-27 15:30:44 +08:00
Jasder a308862567 FIX 优化ci流程,并配置gitea相关database 2020-09-27 11:30:37 +08:00
Jasder db6e3b0f38 FIX fork users list api bug 2020-09-25 10:41:32 +08:00
Jasder 135bdfd69f FIX code bug 2020-09-23 11:12:15 +08:00
Jasder 76b9031fc8 FIX bug 2020-09-23 11:06:54 +08:00
Jasder a97bbb6ddb Update ci db schema 2020-09-23 09:17:30 +08:00
Jasder 467f278de5 ADD ci datbase config 2020-09-18 16:40:54 +08:00
Jasder b74d43083e FIX 解决ci 数据库安全性问题 2020-09-18 15:26:14 +08:00
Jasder fae4907fd1 FIX set ci repo default value 2020-09-11 16:34:19 +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 ad43c6975b ADD 解决ci端用户授权后,项目同步失败的问题 2020-09-10 18:00:37 +08:00
Jasder 217dfc03b2 ADD ci namespace modle associations 2020-09-10 10:53:12 +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 e77475e26a ADD ci cloud account authenticate url 2020-09-04 17:35:29 +08:00
Jasder e0dac72114 FIX ci repos dependent destroy bug 2020-09-04 16:45:38 +08:00
Jasder 32ec60bbe3 FIX 完善ci服务的解绑流程 2020-09-04 10:17:44 +08:00
Jasder 562d0b7b07 ADD 个人中心添加devops管理功能 2020-09-03 15:52:54 +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 903103ec5d FIX ci active repo bug 2020-08-28 11:40:29 +08:00
Jasder b75896821f FIX 优化ci初始化流程 2020-08-28 10:25:08 +08:00
Jasder 2866c060c7 FIx code review 2020-08-26 16:24:51 +08:00
Jasder 5375c3ec71 ADD build status with killed 2020-08-25 17:01:03 +08:00
Jasder 1617a541fe FIX code review 2020-08-25 15:59:53 +08:00
Jasder 1ea9e420be ADD paginate for builds api 2020-08-25 15:43:30 +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 7c1ab2cddf FIX 重构ci流程 2020-08-20 18:37:53 +08:00
Jasder a4d8338cb5 ADD ci database port 2020-08-17 14:29:09 +08:00
Jasder 7bb43700b4 ADD namespace ci for model 2020-08-17 11:22:53 +08:00