Commit Graph
70 Commits
Author SHA1 Message Date
lichengjun 8f4cfb67da * Add Sync MR from GitLab API to Zentao database, default time 5 minutes to execute once. 2021-08-30 06:52:02 +00:00
Guan Xiying 0a56e0100e * Fix comments. 2021-08-26 17:45:16 +08:00
Guan Xiying 8c32895ad8 * Fix comments. 2021-08-26 17:44:44 +08:00
Guan Xiying 1160e1eba7 * Use common::printLink and remove extra comments. 2021-08-26 17:44:06 +08:00
Guan Xiying 03b9fd3982 * Add apiError->createMR lang item. 2021-08-26 17:43:10 +08:00
Guan Xiying cfd56b03f0 * Remove processMR function, Adjust api error message. 2021-08-26 17:41:35 +08:00
Guan Xiying 3110a903c3 * Fix ajaxGetMRTragetProjects. 2021-08-26 17:41:13 +08:00
Guan Xiying 567f80f171 * Fix ajaxGetMRTragetProjects and remove and Fix comments. 2021-08-26 17:40:03 +08:00
Guan Xiying ed95aa5dbd * Fix rignt spell error. 2021-08-26 17:08:09 +08:00
Guan Xiying 2d6419c497 * Adjust style of pipeline status. 2021-08-26 16:58:29 +08:00
Guan Xiying 0a88f13f16 - Delete list.html.php . 2021-08-26 16:46:47 +08:00
Guan Xiying 9b1ca198bc * Adjust style of view MR page. 2021-08-26 16:45:29 +08:00
Guan Xiying 7239c66129 * Add js file of mr diff page. 2021-08-26 14:22:19 +08:00
Guan Xiying 6e3158cc69 * Finish view mr codes diff page. 2021-08-26 14:20:52 +08:00
Guan Xiying eef945755f * Add diff page. 2021-08-25 10:36:18 +08:00
Guan Xiying 754163aae4 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-25 10:33:09 +08:00
Guan Xiying 7ed0e3c970 * Add getDiffs function. 2021-08-25 10:32:44 +08:00
dingguodong df116c8cdb * Add view a MR(staging). 2021-08-24 23:22:35 +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 80c872be80 * Rename mrModel::edit function. 2021-08-23 17:08:03 +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
Guan Xiying 7ccb99423b * Fix delete mr error. 2021-08-23 17:04:51 +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 73d1634090 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-23 15:05:31 +08:00
dingguodong e26c267231 * Add view functions for MR. 2021-08-23 15:03:36 +08:00
dingguodong e89f6043b0 * Optimize some function of processMR. 2021-08-23 15:01:34 +08:00
Guan Xiying f0ed277adb * Fix browe mr page. 2021-08-23 14:15:55 +08:00
dingguodong 807ad4b4e8 * Bug fix for editing a MR. 2021-08-23 10:41:37 +08:00
dingguodong 2c0afdeedc * Correct bad syntax. 2021-08-23 10:40:34 +08:00
dingguodong 852120191b * Edit/Update a MR. 2021-08-23 09:20:58 +08:00
dingguodong 11356d714a * Make browse MR work. 2021-08-20 16:31:37 +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 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 84b7170f9c * Finish the control and view for creating MR. 2021-08-20 12:12:56 +08:00
dingguodong d95711841d * Add some functions to creating MR(staging). 2021-08-19 18:22:42 +08:00
dingguodong 2999fd6e49 * Finish the view of creating MR(staging). 2021-08-19 18:18:56 +08:00
dingguodong 2d16d4302d * Remove addGitlab. 2021-08-19 18:11:41 +08:00
dingguodong 080f26ae86 * Change getApiRoot to from gitlab module. 2021-08-19 14:01:07 +08:00