Commit Graph

87 Commits

Author SHA1 Message Date
王怡栋
46f2aecae3 Merge branch 'sprint/167' 2021-11-01 15:27:58 +08:00
mayue
d506cba4a5 *Fix bug #15506. 2021-10-18 17:17:13 +08:00
mayue
1bfd0b0b62 * Fix bug #15506. 2021-10-18 16:55:50 +08:00
dingguodong
c0764bb1e9 * Add GitLab and ZenTao user binding status. 2021-10-11 16:21:11 +08:00
dingguodong
f3ebd7bdea * Fix bug that fetching users form GitLab API limited to 20 users. 2021-10-08 16:44:12 +08:00
dingguodong
db1c0ebb30 * Merge codes for gitlab from 15.5. 2021-09-15 10:57:05 +08:00
dingguodong
cf102db743 * Set menu in constructor of every module under devops. 2021-09-08 17:34:17 +08:00
dingguodong
314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +08:00
dingguodong
e679938379 * Update ajaxGetMRUserPairs function. 2021-09-01 10:29:03 +08:00
lichengjun
4cd4dd6a3d * Add GitLab view template and control view function. 2021-08-27 07:36:48 +00:00
lichengjun
38c327927f * Adjust GitLab history log. 2021-08-26 05:49:38 +00:00
dingguodong
13f2529a7c * Fix bug#14617. 2021-08-25 13:26:25 +08:00
lichengjun
67569ee658 * Add GitLab log. 2021-08-24 07:36:22 +00:00
Guan Xiying
d61afb2d76 * Add space. 2021-08-23 13:25:04 +08:00
Guan Xiying
9afcbc7a84 * Fix check admin tocken codes. 2021-08-23 13:13:57 +08:00
Guan Xiying
b47ea4a052 * Add check admin tocken function. 2021-08-23 13:08:42 +08:00
lichengjun
7e4610ce9b * Adjust gitlab code. 2021-08-20 07:17:40 +00:00
lichengjun
773ac9ef95 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-20 06:29:09 +00:00
lichengjun
08f9e8e572 * Adjust GitLab MR Delete function. 2021-08-20 06:27:58 +00:00
dingguodong
90e660b388 * Get MR user pairs to select assignee_ids and reviewer_ids. 2021-08-20 12:11:37 +08:00
lichengjun
60f9f418ea * Adjust gitlab token Permissions code. 2021-08-20 01:53:14 +00:00
lichengjun
6bd20ecaaf * Adjust GitLab admin token fix bug. 2021-08-20 01:28:54 +00:00
dingguodong
b3947d30e5 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-19 18:23:58 +08:00
dingguodong
66c69c04c9 * Correct ajaxGetProjectBranches function. 2021-08-19 18:13:08 +08:00
Guan Xiying
5537f3500a * Remove extra line. 2021-08-19 16:32:40 +08:00
lichengjun
b14f5af220 * Add GitLab Token authority verification. 2021-08-19 08:28:59 +00:00
dingguodong
1b14499cae * Revert checkToken function. 2021-08-19 15:08:52 +08:00
lichengjun
34391dbe4c * Adjust Gitlab list function. 2021-08-18 08:49:02 +00:00
dingguodong
3dc7a2111b + Get project branches. 2021-08-17 17:44:58 +08:00
lichengjun
92cac9b4c2 * Adjust the gitlab validation style. 2021-08-16 07:29:19 +00:00
holan20180123
34fca03d67 * Fix bug #13967. 2021-08-05 16:11:04 +08:00
dingguodong
67a3e24155 * Set menu when changing tab(menu) from gitlab to repo. 2021-08-04 15:22:05 +08:00
dingguodong
a18fdc5a54 - Remove extra line for importing issues. 2021-08-03 15:47:34 +08:00
dingguodong
dbdea2e48c * Add lang for gitlab module and adjust codes after code review. 2021-08-03 15:21:01 +08:00
dingguodong
21c9ee13bc + Add ajaxc getting gitlab project pipeline. 2021-07-22 09:27:24 +08:00
zhujinyong
6f04aedcd3 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 09:44:23 +08:00
zhujinyong
1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
hufangzhou
be50281d7a * Adjust the code. 2021-07-15 15:19:59 +08:00
lichengjun
a9862dc312 * Fix Bug 13654 and 13651. 2021-07-14 21:21:36 +08:00
lichengjun
8b2db53ab2 *Add title in importIssue function. 2021-07-14 10:14:18 +08:00
dingguodong
fee5d53f94 * Optimize import issue and bug fix. 2021-07-13 16:50:46 +08:00
dingguodong
9ae5f3e8fe * Change getting repoID from _GET to getting from para. 2021-07-13 10:02:06 +08:00
dingguodong
cc60268ee4 * Filter issue in gitlab using alternative way. 2021-07-12 14:32:48 +08:00
dingguodong
ab2e2191e3 * Bug fix and optimize for import issue. 2021-07-09 13:48:23 +08:00
dingguodong
b062fe0a8e * Optimize codes when importing issues. 2021-07-09 10:16:12 +08:00
dingguodong
47102c509e + Finished importing issue to story. 2021-07-08 15:55:11 +08:00
dingguodong
129e14bf30 * Finish importing issue to zentao bug(staging). 2021-07-08 14:30:28 +08:00
dingguodong
b42bc4afc9 * Optimize url parameter. 2021-07-07 17:29:53 +08:00
dingguodong
e9bcb88d9e * Rename saveSyncedIssue to saveIssueRelation, add func doc. 2021-07-07 17:09:04 +08:00
dingguodong
d241e218ce * Finished import gitlab issue to task. 2021-07-06 17:35:02 +08:00