Commit Graph

191 Commits

Author SHA1 Message Date
孙广明
0ce4f4dd1d Merge branch 'liyuchun_64397' into 'zenops_41'
* Finish task #64269.

See merge request easycorp/zentaopms!4897
2022-08-11 00:20:46 +00:00
liyuchun
6c2cacf02c Merge branch 'master' into zenops_41 2022-08-10 08:26:42 +00:00
liyuchun
273698d8e6 * Finish task #64269. 2022-08-10 06:54:20 +00:00
caoyanyi
0679729a7e * Modify server delete tip. 2022-08-05 15:39:24 +08:00
caoyanyi
85f8b08428 * Modify code download. 2022-08-04 14:25:16 +08:00
daitingting
b834dc794f * Finish task #62919,#62923,#62924. 2022-08-02 07:43:12 +00:00
caoyanyi
fc8be7e037 * Modify lang error. 2022-07-20 13:35:49 +08:00
caoyanyi
8163199cf1 * Modify merge request for gitea. 2022-07-19 10:56:04 +08:00
liyuchun
721b8d31c0 * Fix error when create mr. 2022-07-18 01:55:31 +00:00
liyuchun
ae06366f2a * Fix bug #25283. 2022-07-15 05:09:12 +00:00
zhaoke
3d7685a12c * Add test task name param to ciresults api. 2022-07-14 07:04:05 +00:00
liyuchun
0044a55b76 * Finish task #59439. 2022-07-05 05:48:02 +00:00
liyuchun
31ca138b18 * Fix bug #23960. 2022-06-29 08:16:20 +00:00
李玉春
497b32f627 Merge branch 'zenops_36' into 'master'
Zenops 36

See merge request easycorp/zentaopms!4066
2022-06-22 07:18:41 +00:00
caoyanyi
2d96651ad9 * Modify repo id save. 2022-06-22 11:57:02 +08:00
tianshujie
7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
caoyanyi
8d8b842ab6 * Add default value. 2022-02-23 15:00:17 +08:00
caoyanyi
d9449bb507 * Modify job result message. 2022-02-10 07:56:14 +00:00
caoyanyi
c07619ac73 * Finish task #48604. 2022-02-10 06:57:43 +00:00
liumengyi
cc3c90291d * Finish task #47483. 2022-01-10 17:32:31 +08:00
王怡栋
bb63a8f6ab * adjust code. 2021-12-30 11:10:45 +08:00
王怡栋
625a6a47c4 * code for task #46553. 2021-12-30 08:38:54 +08:00
zenggang
4955bd5450 * Fix bug#17909,17910 2021-12-24 02:46:49 +00:00
zenggang
b9e46558c5 * Code for task#46005 2021-12-23 09:21:51 +00:00
zenggang
4c96f9d833 * Code for task#46005 2021-12-23 01:02:23 +00:00
zenggang
cb1c14b98b * Adjust code style 2021-12-22 02:59:57 +00:00
zenggang
4ae4c69ea4 * Finish task#46005 2021-12-22 00:54:44 +00:00
孙广明
13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
liyuchun
f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
zenggang
8d458a0a72 * Finish task#44404 2021-11-23 11:08:15 +00:00
dingguodong
36cf32bb9b * Make codes meet the CR rules. 2021-10-27 11:08:37 +08:00
dingguodong
0a93db90f2 * Add comments and notes. 2021-10-27 10:41:03 +08:00
dingguodong
4eaf583ea8 * Fix bug when exec gitlab pipeline in job module. 2021-09-15 09:55:42 +08:00
dingguodong
e9887b9976 * Change function commitResult after code review. 2021-08-18 14:52:15 +08:00
dingguodong
e6d377561b * Fix bug when checking compile status and adding privileges etc. 2021-08-05 14:01:46 +08:00
wangyidong
cfda81bede * fix for edit job. 2021-08-05 13:57:57 +08:00
dingguodong
a173f112dc * Change loadModel to access apiGetJobLog func from gitlab module. 2021-08-03 11:16:34 +08:00
dingguodong
9cc4e07ee0 * Correct wrong codes for checkCompileStatus func. 2021-08-02 16:42:45 +08:00
dingguodong
7b8d9695ce * Reformat codes for syncGitlabTaskStatus after code review. 2021-08-02 16:26:18 +08:00
dingguodong
b7b2427661 * Fix the bug for job status wrong after checkCompileStatus. 2021-07-30 09:54:35 +08:00
Guan Xiying
6fe756fb14 * Adjust param of ciModel::checkCompileStatus function. 2021-07-29 16:26:20 +08:00
Guan Xiying
d180d67c91 * Adjust syncGitlabTaskStatus function. 2021-07-29 16:13:58 +08:00
dingguodong
ca8a8229bf * Display and reformat job log. 2021-07-28 10:33:46 +08:00
dingguodong
22e7de0524 * Display gitlab pipeline log and add refresh button. 2021-07-27 17:26:45 +08:00
Guan Xiying
55731a6c50 * Add sync gitlab pipeline job status function. 2021-07-27 11:05:54 +08:00
dingguodong
443f016f25 * Finish task #40406 (change jenkins variables to general name). 2021-07-21 13:57:20 +08:00
dingguodong
cfd37eb46d * Revert jenkins related files. 2021-07-20 16:48:41 +08:00
dingguodong
e5ea831b9d * Change jenkins variables to general name. 2021-07-20 16:05:43 +08:00