Commit Graph
168 Commits
Author SHA1 Message Date
liyuchun 4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00
zhujinyong e0217a1569 * Fix bugs of repo api. 2021-12-09 13:39:37 +08:00
李玉春 3f2793e5bd Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"
This reverts merge request !803
2021-12-07 08:50:57 +00:00
王怡栋 cf280763b2 Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.

See merge request easycorp/zentaopms!803

(cherry picked from commit ff06288dc8)

b11dd3af  * Finish task #45491.
2021-12-07 08:49:16 +00:00
liyuchun b11dd3af4e * Finish task #45491. 2021-12-07 16:15:21 +08:00
孙广明 93547bf85b Merge branch 'sprint/devops_liyuchun_16893' into 'master'
Fix bug #16997, #16893.

See merge request easycorp/zentaopms!722
2021-12-02 02:39:31 +00:00
zenggang bcb6dbbe0a * Fix bug#16945 2021-12-02 00:54:51 +00:00
liyuchun d68810fd4a * Fix bug #16893. 2021-12-02 08:54:51 +08:00
dingguodong 2f8512af1f * Fix bug when changing repo type from others to GitLab. 2021-11-25 16:51:37 +08:00
xiawenlong 96c9cad4d9 * delete un unsed code 2021-11-12 11:25:52 +08:00
xiawenlong 976e00197f update gitlab webhook 2021-11-11 18:16:01 +08:00
Guan Xiying 5c4178002d * Remove extra space. 2021-09-09 15:44:27 +08:00
dingguodong 314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +08:00
zhujinyong 664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
liyuchun f318aa5e98 * Finish task #41591. 2021-08-27 16:43:00 +08:00
liyuchun d392f0e44c * Code for task #41764. 2021-08-26 17:59:58 +08:00
Guan Xiying 30f4e19096 * Add disable attribute on disabled link. 2021-08-22 16:53:33 +08:00
tianshujie98 f133fc8f10 * Finish task #41592. 2021-08-20 10:30:12 +08:00
Guan Xiying 804fd2c559 * Fix ajaxLoadPorducts to ajaxLoadProducts. 2021-08-05 16:32:16 +08:00
wangyidong 54d8c561c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 13:32:00 +08:00
wangyidong 7f5db66701 * adjust for delete repo and jenkins. 2021-08-05 13:30:57 +08:00
holan20180123 776a2d45b2 * Adjust logic of product link job. 2021-08-05 13:23:29 +08:00
wangyidong bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
wangyidong 545d611d56 - delete null row. 2021-08-02 14:31:59 +08:00
Guan Xiying a9811d2bfe * Trim repo->prefix of gitlab repo. 2021-07-27 10:39:18 +08:00
Hao Sun d113a7f150 * bug #13848, fix border style for panels and cells. 2021-07-27 10:03:34 +08:00
dingguodong bbd3368393 * Rename codes to meet devel rule and bug fix on params. 2021-07-23 14:09:17 +08:00
dingguodong 7305db37c1 * Revert repo module from jihu branch's feature. 2021-07-23 10:09:14 +08:00
wangyidong 9fcf997f96 * adjust for locate url. 2021-07-19 15:11:42 +08:00
lichengjun cb82b46f52 * Fix GitLab Module code. 2021-07-19 10:37:45 +08:00
Guan Xiying d5569ed55c * Fix code format and comments of ajaxGetGitlabProjects function. 2021-07-16 17:18:15 +08:00
wangyidong aa9871385a * fix bug #13618. 2021-07-16 16:49:35 +08:00
lichengjun b93f366581 * Adjust GitLab. 2021-07-16 16:12:17 +08:00
lichengjun a7d53c67e7 *Fix bug ID 40655. 2021-07-16 14:39:07 +08:00
zhujinyong 1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
dingguodong 1d0f19caaa + Delete project relation when user deleting a repo. 2021-07-13 11:06:13 +08:00
dingguodong a55f27056e * Fix bug when create a repo with gitlab. 2021-06-24 09:37:50 +08:00
Guan Xiying 2891589492 * Show gitlab and gitlab projects selector in create task view. 2021-06-23 15:16:54 +08:00
Guanxiying d8a99bcf9e * Process gitlab id and gitlab project of one repo. 2021-06-16 19:45:23 +08:00
dingguodong 26315605a2 * Rename funcs on need. 2021-06-16 13:30:56 +08:00
Guanxiying f918d0c652 * Set gitlab info by gitlab server. 2021-06-10 13:59:44 +08:00
wangyidong 5ea1603678 * code for task #38642. 2021-06-01 11:03:17 +08:00
wangyidong cab32bab5b * fix bug for #12853. 2021-05-28 15:55:21 +08:00
wangyidong a09aab24f8 * fix for sync gitlab. 2021-05-28 13:22:28 +08:00
wangyidong bf365b9188 * adjust for gitlab branch. 2021-05-27 14:16:44 +08:00
holan20180123 49e9302c31 * Return id when create object by API. 2021-05-12 17:00:26 +08:00
wangyidong 3b8dd3db34 * fix bug #12050. 2021-04-28 10:53:52 +08:00
Guanxiying 4c329dfcef Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-22 10:40:40 +08:00
Guanxiying 5ec52b5ba4 * Fix Gitlab judgement. 2021-04-22 10:35:16 +08:00
qiyu-xie 4f13550639 * Fix bug. 2021-04-20 13:31:35 +08:00