Commit Graph

66 Commits

Author SHA1 Message Date
dingguodong
7e2466b119 * Optimize and streamline the codes. 2021-09-15 16:31:57 +08:00
dingguodong
be3dfb76c9 * Change the begin time of todo to undefined for MR. 2021-09-15 13:29:30 +08:00
lichengjun
ff5288131b * Adjust Details Code Format. 2021-09-09 13:05:38 +00:00
lichengjun
0669d4653a * Adjust Details Code Format. 2021-09-09 12:08:58 +00:00
lichengjun
b8e19bf4fc * Adjust GitLab MR Details Style. 2021-09-09 10:29:13 +00:00
lichengjun
f2b7e270d3 * Fix gitlab mr details format. 2021-09-09 09:55:11 +00:00
lichengjun
31a0b96717 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-09 06:45:59 +00:00
lichengjun
30fc52a695 * Fix GitLab mr Details Style And API request condition status pending. 2021-09-09 06:42:09 +00:00
dingguodong
7cb746d5bb * Correct select merge request from db. 2021-09-09 13:30:39 +08:00
dingguodong
893f0455f5 * Fix bug when creating todo for mr. 2021-09-09 11:50:45 +08:00
dingguodong
ce3d71c795 * Add merge request title to that todo. 2021-09-09 11:30:50 +08:00
dingguodong
1c45dfc33f * Fix bug #15033, complete TODO for merge request. 2021-09-09 11:19:55 +08:00
dingguodong
842f2209a0 - Remove reviewer from creating and updating MR. 2021-09-09 09:44:04 +08:00
dingguodong
44396cde9a * Create a todo item for this merge request. 2021-09-09 09:09:30 +08:00
dingguodong
81092346b7 * For compatibility with PHP 5.4 . 2021-09-08 18:00:43 +08:00
Guan Xiying
b305b8c752 * Fix bug #15009 and change config->MR to config->mr. 2021-09-08 10:13:28 +08:00
dingguodong
6de75d2fcb * Fix bug for sync mr. 2021-09-07 20:17:31 +08:00
dingguodong
70f0136b2b Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-07 10:51:12 +08:00
dingguodong
8e8875319f * Optimize function getDiffs. 2021-09-07 10:50:44 +08:00
lichengjun
12935f3ead * Adjust GitLab MR TODO Detail. 2021-09-07 02:33:36 +00:00
lichengjun
90c3e3479f * Fix GitLab MR sync status. 2021-09-07 01:58:24 +00:00
lichengjun
a786e5f00d * GitLab MR Code Merge. 2021-09-07 00:50:33 +00:00
lichengjun
1c3f706088 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-07 00:46:31 +00:00
lichengjun
7ca5893ce2 * Cancel GitLab SYNC Settings. 2021-09-07 00:44:34 +00:00
dingguodong
9d5c1de0ab * Sync MR in ZenTao database whatever status of MR in GitLab. 2021-09-06 17:57:27 +08:00
dingguodong
fde5d66e3c * Adjust function comment. 2021-09-03 14:54:35 +08:00
dingguodong
7d83d3110f * Fix bug when sudo as user. 2021-09-03 13:20:53 +08:00
dingguodong
8201fafc46 + Get sudo user ID in GitLab. 2021-09-02 15:20:21 +08:00
dingguodong
1009626f39 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-02 14:20:45 +08:00
dingguodong
cbf7227e89 * Correct the bug when a API error is raised. 2021-09-02 14:19:43 +08:00
lichengjun
db552dc428 * Adjust sync gitlab mr code. 2021-09-02 06:13:18 +00:00
lichengjun
d2a348b57b Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-01 07:03:04 +00:00
lichengjun
7f71a63468 * Sync GitLab Todo ZenTao Todo. 2021-09-01 07:02:17 +00:00
dingguodong
95c2adad70 * Correct apiAcceptMR and update functions. 2021-08-31 11:05:22 +08:00
Guan Xiying
cfd56b03f0 * Remove processMR function, Adjust api error message. 2021-08-26 17:41:35 +08:00
Guan Xiying
eef945755f * Add diff page. 2021-08-25 10:36:18 +08:00
dingguodong
4f94bcafc5 * Update function for editing a MR. 2021-08-24 11:13:00 +08:00
dingguodong
be9a94087c * Change assignee and reviewer from gitlab user ID to zentao account. 2021-08-24 10:52:35 +08:00
dingguodong
18569c95d2 * Update apiSyncMR function. 2021-08-24 10:19:57 +08:00
dingguodong
dc981a4a05 * Update function for editing MR. 2021-08-24 08:26:13 +08:00
dingguodong
957d19ed92 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-23 17:58:40 +08:00
dingguodong
6095bc4246 * Get latest MR from GitLab API before display MR. 2021-08-23 17:57:50 +08:00
Guan Xiying
eb5e3dbac7 * Fix params of apiGetSingleDiffVersion and apiGetDiffVersions. 2021-08-23 17:14:34 +08:00
Guan Xiying
d2e51fb7a3 * Rename mrModel::edit function. 2021-08-23 17:07:26 +08:00
Guan Xiying
1e26528ffe Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-23 17:06:34 +08:00
Guan Xiying
82ba7789b6 * Fix params of get versions api. 2021-08-23 17:06:21 +08:00
dingguodong
84f5c25aa9 * Refactor the function for editing MR. 2021-08-23 16:53:10 +08:00
dingguodong
95c9e107c3 * Refactor creating function for MR. 2021-08-23 16:22:46 +08:00
dingguodong
e89f6043b0 * Optimize some function of processMR. 2021-08-23 15:01:34 +08:00
dingguodong
807ad4b4e8 * Bug fix for editing a MR. 2021-08-23 10:41:37 +08:00