Commit Graph
68 Commits
Author SHA1 Message Date
caoyanyi af0c0d4eae * Modify job exec check. 2022-08-09 14:19:32 +08:00
caoyanyi abc3542cf3 * Modify repo list. 2022-07-28 13:01:32 +08:00
caoyanyi d9b1d038eb * Modify page style and some bug. 2022-07-28 11:31:24 +08:00
caoyanyi a146a7633a * Modify data display. 2022-07-20 16:49:01 +08:00
caoyanyi a637e8af2a * Modify url param. 2022-07-20 16:35:21 +08:00
caoyanyi e8951a847a Merge branch 'master' into zenops_38 2022-07-18 10:11:16 +08:00
liyuchun 9b26371429 * Fix bug #25247. 2022-07-15 00:59:08 +00:00
liyuchun 6102e2df6a * Modify gitlab to git service in repo module. 2022-07-14 00:53:13 +00:00
liyuchun 0951f5b56d * Fix bug #24840,24821. 2022-07-08 01:45:48 +00:00
liyuchun 0044a55b76 * Finish task #59439. 2022-07-05 05:48:02 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liumengyi 74585f71d0 * Finish bug #19955. 2022-02-24 14:40:17 +08:00
zhujinyong 002e215a3d * Move die to return. 2022-02-22 09:02:00 +08:00
caoyanyi f82a59604b * Modify common function. 2022-01-17 06:53:53 +00:00
李玉春 959560f680 Merge branch 'devops19' into 'devops_caoyanyi_bug'
# Conflicts:
#   module/job/control.php
2022-01-17 01:59:45 +00:00
caoyanyi 07ba811bc2 * Modify trash data tips. 2022-01-17 01:22:51 +00:00
caoyanyi 20f291b9b2 * Fix bug #18448. 2022-01-14 06:52:35 +00:00
liyuchun 19905f7eda * Fix bug #18450,18447. 2022-01-14 11:26:28 +08:00
李玉春 e50bb1f221 Merge branch 'devops19' into 'devops19_caoyanyi_47221'
# Conflicts:
#   module/sonarqube/control.php
#   module/sonarqube/model.php
2022-01-12 07:02:42 +00:00
caoyanyi 9da6e4b9c0 * Finish task #47221. 2022-01-12 06:44:54 +00:00
liyuchun c5aaae3eb8 * Finish task #47233. 2022-01-12 14:16:34 +08: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
liyuchun cfd5455a58 * Fix error when has no gitlab. 2021-12-01 15:03:28 +08:00
liyuchun 0c66d3c5b8 * Fix error when no gitlab. 2021-12-01 14:40:49 +08:00
liyuchun cce8477c1c * Fix bug #16842. 2021-12-01 10:22:52 +08:00
liyuchun e80d9acf37 * Finish task #44796. 2021-11-25 14:51:11 +08:00
xiawenlong 8c1f8ea70c *Finish 44403,44406,44406,44401 2021-11-17 10:53:37 +08:00
dingguodong ff55234a7b * Correct codes in job and compile module. 2021-10-29 17:33:13 +08:00
dingguodong 36cf32bb9b * Make codes meet the CR rules. 2021-10-27 11:08:37 +08:00
dingguodong fff67388f8 * Fix the bug that user can not select pipeline from jenkins. 2021-10-27 10:39:11 +08:00
dingguodong 314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +08:00
Guan Xiying a5ceffb6cf * Fix exec gitlab job bug and adjust exec job function. 2021-09-06 17:29:37 +08:00
Guan Xiying ddfe2479ac * Finish task #41976, adjust exec gitlab function. 2021-09-06 16:46:07 +08:00
王怡栋 4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
Guan Xiying ff83efb066 * Add manage reference of gitlab job function. 2021-09-01 10:57:07 +08:00
Guan Xiying c1059facef * Check gitlab token when create gitlab job. 2021-08-25 10:44:06 +08:00
王怡栋 9c83f3b3b6 * adjust for lower php version. 2021-08-24 13:04:52 +08:00
Guan Xiying 83d8d8477f * Check gitlab token when create gitlab job. 2021-08-23 13:25:18 +08:00
dingguodong eeb18662bc Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 16:32:25 +08:00
dingguodong 39ebbc2784 * It does not display repos which are not giltab type when editing it. 2021-08-05 16:28:52 +08:00
wangyidong 3fc2eecb3c * adjust for show dao error. 2021-08-05 16:25:08 +08:00
Guan Xiying 0c3817ded1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 15:48:15 +08:00
Guan Xiying b63623ad27 * Disable local git and svn repo in gitlab job. 2021-08-05 15:47:41 +08:00
wangyidong 54d8c561c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 13:32:00 +08:00
holan20180123 776a2d45b2 * Adjust logic of product link job. 2021-08-05 13:23:29 +08:00
wangyidong 0f17432c53 * adjust for create job. 2021-08-05 13:08:17 +08:00
dingguodong 415eee6922 * Adjust codes after code review for job module. 2021-08-03 15:22:26 +08:00
Guan Xiying 800ff00032 * Fix exec gitlab pipeline function. 2021-07-29 17:28:51 +08:00