Commit Graph
22907 Commits
Author SHA1 Message Date
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 304ed9c54e Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-23 16:23:40 +08:00
dingguodong 95c9e107c3 * Refactor creating function for MR. 2021-08-23 16:22:46 +08:00
lichengjun 581791948c * Fix GitLab bug. 2021-08-23 07:54:44 +00: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
dingguodong 615ba5eac4 * Correct menu display of MR. 2021-08-23 15:00:33 +08:00
Guan Xiying f0ed277adb * Fix browe mr page. 2021-08-23 14:15:55 +08:00
Guan Xiying a04e1a0cb8 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-23 10:49: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
Guan Xiying 569cbe909e Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-22 16:58:05 +08:00
Guan Xiying 30f4e19096 * Add disable attribute on disabled link. 2021-08-22 16:53:33 +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
lichengjun 7e4610ce9b * Adjust gitlab code. 2021-08-20 07:17:40 +00: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
dingguodong 2056fc52ff + Add getBranches functions. 2021-08-20 15:13:30 +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 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
lichengjun 26a3ee3782 *Adjust GitLab code. 2021-08-20 01:01:53 +00:00
lichengjun c5a67c2808 * Adjust the gitlab permission to judge the presentation. 2021-08-20 00:45:10 +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 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 1dc911db56 + Add apiGetUpstream,apiGetForks, getUserIdRealnamePairs. 2021-08-19 18:14:53 +08:00
dingguodong 66c69c04c9 * Correct ajaxGetProjectBranches function. 2021-08-19 18:13:08 +08:00
dingguodong 2d16d4302d * Remove addGitlab. 2021-08-19 18:11:41 +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
lichengjun 9b20bfdf19 * Adjust jihuMR zh. 2021-08-19 08:20:09 +00:00
dingguodong 1b14499cae * Revert checkToken function. 2021-08-19 15:08:52 +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 34391dbe4c * Adjust Gitlab list function. 2021-08-18 08:49:02 +00:00