Trustie
/
forgeplus
forked from Gitlink/forgeplus
21
0
Fork 5
Code Issues Pull Requests Projects Releases Wiki Activity
1,964 Commits 56 Branches 0 Tags 846 MiB
Commit Graph

1565 Commits

Author SHA1 Message Date
jasder 0f67944911 FIX code bug 2021-03-23 15:58:12 +08:00
jasder 8b656fd409 FIX bug 2021-03-23 15:47:01 +08:00
jasder 815b364428 ADD common url with setting api 2021-03-23 15:42:56 +08:00
jasder 18ae3853d7 FIX update setting api 2021-03-23 11:42:22 +08:00
jasder ce18cc380a Merge branch 'develop' into trustie_server 2021-03-22 21:02:17 +08:00
jasder cbc6f4e7d1 fix bug 2021-03-22 20:53:39 +08:00
jasder aa23762b2f FIX update setting api for nav bar url 2021-03-22 18:02:12 +08:00
vilet.yy 5c864acb64 fix: create repo not use website 2021-03-22 15:50:08 +08:00
vilet.yy 8bbfea2079 fix 2021-03-22 11:18:04 +08:00
vilet.yy 8c2a543e61 fix: project code change to default 2021-03-22 11:16:35 +08:00
jasder 0909223867 FIX get readme api method 2021-03-21 11:24:34 +08:00
vilet.yy 223755a965 fix: languages filter 0.0% 2021-03-19 18:36:55 +08:00
vilet.yy f1ed61c687 add: menu permission control 2021-03-19 18:01:29 +08:00
vilet.yy 553a584121 fix: migrate create unit 
fix
 2021-03-19 17:38:14 +08:00
vilet.yy db2ba95e24 fadd: repo edit unit 2021-03-19 15:05:09 +08:00
vilet.yy 39f0811f0a fix:simple unit 2021-03-19 14:58:25 +08:00
vilet.yy 6a7ef2a1a7 add: repo contributors 2021-03-18 16:35:46 +08:00
vilet.yy 25186b4e81 fix 2021-03-18 09:55:58 +08:00
vilet.yy a627ab4d82 fix 2021-03-18 09:51:56 +08:00
vilet.yy 8f98a83379 add: project unit list 2021-03-17 13:50:26 +08:00
vilet.yy a14459da50 add: project menu list 2021-03-17 11:52:36 +08:00
vilet.yy f17e436d62 add: doc 2021-03-16 11:10:58 +08:00
vilet.yy 34d95451b5 add: get project all files 2021-03-16 10:25:37 +08:00
vilet.yy b43926f69f add: new project detail 2021-03-15 19:01:35 +08:00
jasder 899e7ccab8 FIX CI 修复参数设置的bug 2021-03-05 15:48:08 +08:00
victor d3df04fb97 参数管理修改 2021-03-05 15:43:42 +08:00
jasder 50928f82c0 FIX valid user before register action 2021-03-05 15:36:26 +08:00
victor 33984e16d0 参数管理修改 2021-03-05 15:26:29 +08:00
jasder 8942c694c4 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-03-05 11:38:45 +08:00
victor d7bc309d49 参数管理删除 2021-03-04 09:33:04 +08:00
victor cb90dc1f51 参数管理 2021-03-03 15:36:59 +08:00
jasder 347af1a8ad Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-03-02 15:21:50 +08:00
vilet.yy ccbaa8efe5 [FIX]pull_request create and update error 2021-03-01 16:43:09 +08:00
jasder 11350bb76f Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-03-01 10:02:35 +08:00
jasder b6b3cb0825 fix bug 2021-02-26 17:51:42 +08:00
jasder fc680b5372 fix notice api 2021-02-26 14:38:32 +08:00
vilet.yy c299c9fa69 [FIX]repository setting entry error 2021-02-26 13:49:29 +08:00
vilet.yy 70922b81db [FIX]watcher type error 2021-02-25 11:52:24 +08:00
vilet.yy 93fa02bd7b [FIX] 
[FIX]

[FIX]
 2021-02-22 10:53:01 +08:00
vilet.yy ef0c44f29c [ADD]fix error script 2021-02-22 10:10:22 +08:00
vilet.yy 9681a1a491 [FIX]sync mirror project 2021-02-21 17:14:51 +08:00
vilet.yy f7b7122d60 [FIX]join projects add org projects and update project private bug 2021-02-21 15:20:04 +08:00
Gitea 11471b1520 [FIX]transfer need to save clone_url 2021-02-21 10:02:47 +08:00
jasder 50d81b2490 FIX schema 2021-02-09 11:49:47 +08:00
jasder 9f4c2bd673 FIX repo setting api for forbidden 2021-02-09 11:48:05 +08:00
viletyy 2b898b0d1f [FIX]remove description 2021-02-06 16:43:41 +08:00
viletyy f06a1f63dd [ADD]project transfer 
[FIX]

[FIX]
 2021-02-06 15:49:59 +08:00
viletyy d85075f951 [FIX]org sync gitea_uid 
[FIX]
 2021-02-06 15:49:56 +08:00
viletyy ec1acde99a [FIX]show teams, org name valid message 2021-02-06 15:49:56 +08:00
viletyy 55528950f1 [FIX]owner text 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 4f6f257b37 [FIX]concat change to concat_ws, org render 403, normal team leave 2021-02-06 15:49:54 +08:00
viletyy 629f3fbbe1 [FIX]little vliad about team_user 2021-02-06 15:49:54 +08:00
viletyy ddaca5bafc [ADD]organization add num_teams 2021-02-06 15:49:54 +08:00
viletyy 1e70764d63 [FIX]teams add user info 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 3d495797c0 [FIX]organization add created_at and total_count 2021-02-06 15:49:54 +08:00
viletyy ce4c71c6a0 [FIX]组织可以不上传头像 2021-02-06 15:49:54 +08:00
viletyy dab57e9af3 [FIX]一些筛选以及创建最大项目数量验证 2021-02-06 15:49:53 +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 31858a79e3 [FIX]成员细节修改 2021-02-06 14:27:47 +08:00
viletyy 7f309edc91 [ADD]组织、组织团队 2021-02-06 14:27:47 +08:00
viletyy c278ed1863 [FIX] 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
Jasder 440cedc109 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop 2021-02-02 16:40:33 +08:00
victor b18fbd698f Merge branch 'develop' into trustie-pipeline 
# Conflicts:
#	app/models/ci/pipeline.rb
 2021-02-02 14:41:23 +08:00
Jasder 6053907828 fix change stoage file derictory 2021-02-02 14:32:16 +08:00
Jasder 9121033a10 ADD upload avatar api with support multiple image formats 2021-02-02 14:32:08 +08:00
victor 8d3838614f FIX pipeline model schma 
# Conflicts:
#	app/models/ci/pipeline.rb
 2021-02-02 14:32:02 +08:00
Jasder 165f8108f7 ADD api document on line 2021-02-02 14:07:46 +08:00
victor 4816ee04d3 流水线列表查询 2021-02-02 13:10:53 +08:00
victor d2209619f0 流水线增加owner选项 2021-02-02 11:48:09 +08:00
victor 155fc35cfa 获取代码库文件sha 2021-02-01 16:19:42 +08:00
victor ce31875c19 根据阶段查询模板接口 2021-02-01 15:17:03 +08:00
victor d214b1ddae 流水线初始化模板名称修改 2021-02-01 13:40:15 +08:00
victor 22d7478349 content接口返回分支 2021-02-01 10:36:30 +08:00
Jasder 458fca9992 fix change stoage file derictory 2021-01-28 15:11:47 +08:00
victor c3f69a48d6 流水线sha查询 2021-01-28 15:04:51 +08:00
victor c3136fc1a8 流水线查询接口修改 2021-01-28 14:14:22 +08:00
victor 2c648b7941 流水线创建修改 2021-01-27 16:27:56 +08:00
victor 6c77b73ec6 创建多条流水线、模板管理 2021-01-26 17:15:53 +08:00
Jasder 3b7d425198 ADD upload avatar api with support multiple image formats 2021-01-26 14:49:02 +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 6d51657ecf FIX get latest commit bug 
(cherry picked from commit b7e23a62d0)
 2021-01-20 14:30:49 +08:00
Jasder 67a7df085c ADD sync repo time print log 
(cherry picked from commit f3d4f437cb)
 2021-01-20 14:30:44 +08:00
Jasder 0adcbaa19f ADD repository languages percentage api 
(cherry picked from commit efa99e0f06)
 2021-01-20 14:30:41 +08:00
Jasder 1c59832abf FIX get assignees bug in issues 
(cherry picked from commit e9223c53de)
 2021-01-20 14:30:39 +08:00
Jasder 814a1d9e6a FIX deal with gitea api response body bug 
(cherry picked from commit e7662b66ce)
 2021-01-20 14:30:36 +08:00
Jasder ffeb076086 FIX pull api bug 
(cherry picked from commit 36a3e36edb)
 2021-01-20 14:30:29 +08:00
Jasder 06a7cb7558 FIX get readme file bug 
(cherry picked from commit 30138cc1fa)
 2021-01-20 14:30:26 +08:00
Jasder 6fa4ee6c14 ADD get readme api 
(cherry picked from commit 232f26ea3b)
 2021-01-20 14:30:24 +08:00
Jasder 5667c0854c FIX [api] get pull bug 
(cherry picked from commit fa01194d3c)
 2021-01-20 14:30:10 +08:00
Jasder b6aa0fd76c FIX render json builder partil performance for pull some api 
(cherry picked from commit f084b72e3a)
 2021-01-20 14:30:06 +08:00
Jasder f212c5213d FIX base and head params problem for compare api 
(cherry picked from commit 4c2c3d17e2)
 2021-01-20 14:30:01 +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
Jasder b7e23a62d0 FIX get latest commit bug 2021-01-20 14:25:07 +08:00
moshenglv ab4af170fb 连接ci数据库名修改，根据repo 2021-01-20 13:52:30 +08:00
moshenglv ab3242569d 流水线查询 2021-01-20 11:54:10 +08:00
Jasder f3d4f437cb ADD sync repo time print log 2021-01-20 09:38:11 +08:00
moshenglv 69c6e2ac3f cotent接口修改 2021-01-19 18:39:57 +08:00
moshenglv efdbc6fd4e 创建流水线文件新增接口返回内容修改 2021-01-19 18:23:28 +08:00
moshenglv 3946c7116b 创建pipeline文件接口 2021-01-19 18:11:00 +08:00
moshenglv 0d6ddad013 查询steps接口修改 2021-01-19 16:23:19 +08:00
Jasder efa99e0f06 ADD repository languages percentage api 2021-01-19 16:21:31 +08:00
moshenglv 7e9acd1850 返回流水线文件sha 2021-01-19 14:19:06 +08:00
moshenglv 1001d10017 流水线字段校验 2021-01-19 14:00:22 +08:00
moshenglv 703be3f9a1 返回流水线内容同步状态 2021-01-19 13:59:55 +08:00
moshenglv f90bc0897b 流水线关联项目 2021-01-19 11:52:29 +08:00
moshenglv 05416339e5 流水线查询返回字段修改 2021-01-19 11:10:47 +08:00
moshenglv 5e0cdba1f9 流水线与项目关联 2021-01-19 11:03:27 +08:00
Jasder 5fd5bf32d8 Merge branch 'develop' 2021-01-18 15:28:38 +08:00
Jasder e9223c53de FIX get assignees bug in issues 2021-01-18 15:28:20 +08:00
Jasder e7662b66ce FIX deal with gitea api response body bug 2021-01-18 11:22:31 +08:00
moshenglv c6aeecb33c 查询阶段返回流水线名称 2021-01-18 09:58:33 +08:00
moshenglv 2d99713cd0 流水线增加用户字段 2021-01-18 09:32:23 +08:00
Jasder 36a3e36edb FIX pull api bug 2021-01-15 18:38:53 +08:00
Jasder 30138cc1fa FIX get readme file bug 2021-01-15 18:36:19 +08:00
Jasder 232f26ea3b ADD get readme api 2021-01-15 15:38:49 +08:00
moshenglv 9af0ff4a71 步骤查询接口返回模板信息修改 2021-01-15 11:05:38 +08:00
moshenglv 4ac7634031 流水线步骤新增、更新 2021-01-14 15:32:49 +08:00
moshenglv da1a992670 流水线查询返回时间格式化 2021-01-13 15:10:24 +08:00
moshenglv cb6c4b1e3f 阶段新增、删除、查询步骤接口修改 2021-01-12 17:40:42 +08:00
Jasder fa01194d3c FIX [api] get pull bug 2021-01-12 17:34:07 +08:00
Jasder f084b72e3a FIX render json builder partil performance for pull some api 2021-01-12 15:55:11 +08:00
Jasder 4c2c3d17e2 FIX base and head params problem for compare api 2021-01-12 15:47:04 +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
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 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 50021a278b FIX generate token bug for regitster api 2020-12-29 18:18:17 +08:00
moshenglv b5ab230a5c 删除调用drone创建用户接口 2020-12-24 10:40:42 +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 a4a315ea32 FIX bug 2020-12-07 10:29:18 +08:00
Jasder 07caa77f97 FIX code review 2020-12-07 10:06:08 +08:00
Jasder 4c980b5774 FIX create protected branch params 2020-12-04 18:15:48 +08:00
Jasder aaf3661fd6 FIX Forces conversion str to boolean 2020-12-04 17:13:58 +08:00
Jasder 3f60dd3f83 ADD edit protected branch api 2020-12-04 16:18:27 +08:00
Jasder b3649f03e7 ADD get protected branch api 2020-12-04 11:06:12 +08:00
Jasder 6a8ae5234b ADD protected branch Features 2020-12-03 15:24:40 +08:00
Jasder a74dd6605b FIX connection ci db when find repo 2020-11-27 18:09:12 +08:00
Jasder a0cd50ffe6 Delete create pr when create or update repo file 2020-11-27 16:46:12 +08:00
Jasder ba14fce0bd ADD string to strip when crate ci cloud account 2020-11-27 10:19:11 +08:00
Jasder 1daf8591ca FIX Adjust call gitea api for security 2020-11-27 10:18:31 +08:00
Jasder a8cbe566cb FIX delete Chain job when create repo 2020-11-27 09:39:46 +08:00
Jasder 0f81caefdf FIX register api for platform default forge 2020-11-26 15:15:51 +08:00
Jasder 9a27b26cef FIX local bug 2020-11-26 15:15:15 +08:00
Jasder 58a80af929 FIX bug 2020-11-24 17:56:30 +08:00
Jasder 17e182788f FIX bug 2020-11-24 17:55:12 +08:00
Jasder 146c21648b FIX . 2020-11-24 11:33:23 +08:00
Jasder 75202b1fc3 FIX code bug 2020-11-24 11:32:03 +08:00
Jasder 5d5f0f42c0 FIX local register bug 2020-11-24 11:30:01 +08:00
Jasder 8f9e12a5e0 Update local register method 2020-11-24 11:22:32 +08:00
Jasder 69f2fd2fbb FIX code review 2020-11-23 15:52:00 +08:00
Jasder 60ac66ebe3 ADD db schema in models 2020-11-23 15:35:03 +08:00
Jasder 558abb71bb Update repository with default branch params 2020-11-19 10:30:18 +08:00
Jasder a54613752e FIX code bug when user register 2020-11-18 10:35:56 +08:00
Jasder f1e3e935af FIX check email exists for register 2020-11-18 10:25:44 +08:00
Jasder 66407eefe1 FIX only email register 2020-11-18 10:17:40 +08:00
Jasder fa6b25a22d FIX render commit bug for sub entries api 2020-11-16 16:03:41 +08:00
Jasder 7449351270 FIX sub entries api return hash object when entries is file 2020-11-16 15:34:16 +08:00
Jasder 0ca699cc49 FIX find educoder project's bug 2020-11-11 10:14:41 +08:00
Jasder b5d3f32d68 FIX code review 2020-11-10 18:18:08 +08:00
Jasder cc19783651 FIX code bug 2020-11-10 18:17:46 +08:00