Commit Graph
26661 Commits
Author SHA1 Message Date
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
Guan Xiying 120a2cd068 * Fix create zt_mr table sql. 2021-08-19 10:20:38 +08: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
lichengjun 6648beb067 * MR code merge. 2021-08-18 03:05:02 +00:00
lichengjun 4b278f6a93 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-18 02:58:57 +00:00
lichengjun 2ae9360cdf * Add Gitlab MR List Function. 2021-08-18 02:57:36 +00:00
dingguodong 14de596bc0 * Rename getObjectNameForJob to getProjectName. 2021-08-18 10:40:15 +08:00
dingguodong 474b438db7 * Optimize main page of MR. 2021-08-18 10:27:31 +08:00
lichengjun 82cedbde1c Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-17 11:16:44 +00:00
lichengjun 8ebe5b4cc9 * adjust the GitLab list function 2021-08-17 11:14:56 +00:00
dingguodong 549ea9bbde * Create MR(staging). 2021-08-17 17:52:55 +08:00
dingguodong d9683594db + Get forked projects. 2021-08-17 17:52:05 +08:00
dingguodong 5728c38e66 * Remove and correct useless statements. 2021-08-17 17:49:47 +08:00
dingguodong 3dc7a2111b + Get project branches. 2021-08-17 17:44:58 +08:00
dingguodong d23d3adf03 * Remove extra project selector in create view. 2021-08-17 09:47:22 +08:00
dingguodong cbddf5ced6 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-16 17:45:18 +08:00
dingguodong fc3a74c1d4 * Add merge request list view. 2021-08-16 17:44:52 +08:00
lichengjun 92cac9b4c2 * Adjust the gitlab validation style. 2021-08-16 07:29:19 +00:00
dingguodong fa062b6b84 * Create MR view. 2021-08-16 14:37:04 +08:00
dingguodong 753fb1b2cd * Add list function for mr control(staging). 2021-08-13 17:35:29 +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
dingguodong 5466c2ed02 + Add gitlab MR model. 2021-08-13 16:19:07 +08:00
dingguodong c7f53c574a * Add TABLE_MR config. 2021-08-13 15:47:01 +08:00
dingguodong 4a43e87e35 * Add zt_mr database table. 2021-08-13 13:57:24 +08:00
lichengjun b8113c047b * Add Language configuration items. 2021-08-12 06:24:48 +00:00