Commit Graph
51 Commits
Author SHA1 Message Date
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
dingguodong 852120191b * Edit/Update a MR. 2021-08-23 09:20:58 +08:00
dingguodong e7089866bc * Update processMR function and bug fix. 2021-08-20 16:29:54 +08:00
dingguodong f5e2f780f4 erge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-20 15:16:46 +08:00
dingguodong 08aff43f08 * Finish creating MR in model. 2021-08-20 15:16:18 +08:00
lichengjun 08f9e8e572 * Adjust GitLab MR Delete function. 2021-08-20 06:27:58 +00:00
dingguodong d95711841d * Add some functions to creating MR(staging). 2021-08-19 18:22:42 +08:00
dingguodong 080f26ae86 * Change getApiRoot to from gitlab module. 2021-08-19 14:01:07 +08:00
Guan Xiying e215bc47f3 * Review codes. 2021-08-19 13:27:17 +08:00
lichengjun e5e0ec2c8d * Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function. 2021-08-19 02:37:48 +00:00
lichengjun 8551ba49e3 * Adjust mr control browse function. 2021-08-19 00:46:15 +00:00
lichengjun 2ae9360cdf * Add Gitlab MR List Function. 2021-08-18 02:57:36 +00:00
dingguodong fc3a74c1d4 * Add merge request list view. 2021-08-16 17:44:52 +08:00
dingguodong fa062b6b84 * Create MR view. 2021-08-16 14:37:04 +08:00
dingguodong e0b0777126 * Update MR model. 2021-08-13 17:33:32 +08:00
dingguodong 9b23391900 * Update MR model. 2021-08-13 16:33:48 +08:00