Commit Graph
185 Commits
Author SHA1 Message Date
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
liyuchun a0669db9be * Fix error when pre merge. 2022-01-11 15:55:32 +08:00
zenggang fce6751316 * Fix bug#18046 and adjust code 2021-12-30 07:06:37 +00:00
王怡栋 9874145789 * fix error for get repo by url. 2021-12-23 14:55:19 +08:00
王怡栋 b7ce8814fb Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Code for task #46001.

See merge request easycorp/zentaopms!1035
2021-12-21 07:27:35 +00:00
liyuchun 4508fec3a3 * Adjust annotation. 2021-12-21 15:26:31 +08:00
王怡栋 29852dd3ea * adjust for getRepoByUrl. 2021-12-20 16:46:16 +08:00
liyuchun 4f896cf87e * Code for task #46001. 2021-12-20 15:35:31 +08:00
王怡栋 b96a5b286d * adjust for task #46002. 2021-12-17 13:03:56 +08:00
xieqiyu b41aa8a4ef * Fix bug#17193. 2021-12-07 17:18:40 +08:00
王怡栋 2837dc322c * adjust for classic mode and fix bug. 2021-12-03 09:25:44 +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
liyuchun e0b03a60a7 * Fix bug #16999. 2021-12-02 09:54:03 +08:00
zenggang 54ab343ed1 * Adjust code style 2021-12-02 01:10:30 +00:00
zenggang bcb6dbbe0a * Fix bug#16945 2021-12-02 00:54:51 +00:00
liyuchun f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
liyuchun e80d9acf37 * Finish task #44796. 2021-11-25 14:51:11 +08:00
zenggang 95e04b9bf0 * Finish task#44397 2021-11-18 10:27:39 +00:00
dingguodong 8dc0a669e9 * Correct bad comments or bad code style. 2021-11-12 18:15:02 +08:00
xiawenlong c004b06e1e finish webhook. 2021-11-12 09:48:11 +08:00
dingguodong 24966356bc * Optimize codes related to handle GitLab webhook and others. 2021-11-11 19:16:05 +08:00
xiawenlong 976e00197f update gitlab webhook 2021-11-11 18:16:01 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
dingguodong efb3a369c8 * Add compile status of job when creating a MR. 2021-11-09 12:10:03 +08:00
dingna ad2da66aac * Finish task #42826. 2021-09-24 09:48:55 +08:00
王怡栋 c9eb3ebfa1 * fix bug for finish task by repo. 2021-09-13 11:14:54 +08:00
dingguodong 71a023247a - Remove getGitlabProjects function from repo model. 2021-08-31 16:09:43 +08:00
zhujinyong 664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
dingguodong 7e4c7dc503 * Fix bug when creating a repo without gitlabProject. 2021-08-27 17:43:54 +08:00
holan20180123 2dc3d78b9a * Finish task #41594. 2021-08-24 17:26:32 +08:00
qiyu-xie 1a17dd0207 * Finish task#41557. 2021-08-19 09:16:15 +08:00
hufangzhou ca17d69bee * Finish task #41596. 2021-08-18 17:21:39 +08:00
qiyu-xie 4671a62533 * Finish task#41595. 2021-08-18 15:56:15 +08:00
Guan Xiying 5c675fe85f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-13 10:40:20 +08:00
Guan Xiying 1488745195 * Fix sync gitlab scm by cron bug. 2021-08-13 10:39:39 +08:00
holan20180123 e22669a101 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 16:44:02 +08:00
holan20180123 5677063f10 * Adjust edit repo logic. 2021-08-05 16:43:40 +08:00
wangyidong 3fc2eecb3c * adjust for show dao error. 2021-08-05 16:25:08 +08:00
holan20180123 776a2d45b2 * Adjust logic of product link job. 2021-08-05 13:23:29 +08:00
Guan Xiying 1cf618686d * Fix prefix of gitlab repo. 2021-08-04 15:58:53 +08:00
dingguodong 56b030f2a6 * Put gitlab to first position and reformat codes. 2021-08-03 11:13:13 +08:00
Guan Xiying 25433731e2 * Remove extra space from repoModel::processGitlab function. 2021-07-29 15:23:26 +08:00
Guan Xiying a9811d2bfe * Trim repo->prefix of gitlab repo. 2021-07-27 10:39:18 +08:00
dingguodong d05be65e7b * Correct misspelled word. 2021-07-23 14:28:44 +08:00
dingguodong 7305db37c1 * Revert repo module from jihu branch's feature. 2021-07-23 10:09:14 +08:00
dingguodong ca014d182f * Enable newer gitlab module for repo. 2021-07-22 09:25:09 +08:00
lichengjun cb82b46f52 * Fix GitLab Module code. 2021-07-19 10:37:45 +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