Commit Graph
26634 Commits
Author SHA1 Message Date
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
dingguodong 0c2f5fd11e * Add creating a gitlab project from repo. 2021-08-12 14:02:07 +08:00
dingguodong a6598c7771 * Show gitlab project list in MR. 2021-08-12 13:39:27 +08:00
dingguodong 685f11f3e5 * Add MR to DevOps menu. 2021-08-12 12:15:01 +08:00
hufangzhou 283b63d327 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-12 10:55:58 +08:00
hufangzhou 7599eb9bad * Task#41242: If only the reviewers has changed when change the story, the story version also plus one. 2021-08-12 10:55:54 +08:00
王怡栋 fc2e14dcab Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-12 10:45:55 +08:00
王怡栋 9e7e2d83b4 * reset session for user avatar. 2021-08-12 10:45:23 +08:00
王怡栋 499a3ce009 * fix for lower php version. 2021-08-12 10:44:58 +08:00
qiyu-xie 4db30b464d * Finish task#41218. 2021-08-12 10:44:04 +08:00
王怡栋 a5677e39a3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-12 09:29:30 +08:00
hufangzhou f6973d6348 * Make the story status active when review the story. 2021-08-12 08:03:00 +08:00
qiyu-xie 28e579f781 * Task#41218. 2021-08-11 22:21:06 +08:00
dingguodong f15f007087 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-11 18:00:25 +08:00
dingguodong ec56a0fed2 * Add API 404 handler for product and project. 2021-08-11 17:59:44 +08:00
dingguodong 98bb1ab539 * Adjust authorization logic for entry. 2021-08-11 17:56:10 +08:00
qiyu-xie 99ef4f4c33 * Task#41217. Modify locate link when manage members. 2021-08-11 17:42:51 +08:00
王怡栋 981eb4590d * fix bug for link plan stories in classic mode. 2021-08-11 17:09:34 +08:00
qiyu-xie 49aa77c3fd * Fix bug#14208. 2021-08-11 17:01:40 +08:00
holan20180123 665cd698b1 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-11 17:00:14 +08:00
holan20180123 c373fb2ade * Fix load avatar error. 2021-08-11 16:59:59 +08:00
qiyu-xie 4acca21bde * Finish task#41217. 2021-08-11 16:55:12 +08:00
zenggang 2a05fe7e21 * Adjust my api 2021-08-11 16:45:52 +08:00
孙广明 8a0be108e4 * Fix story track bug. 2021-08-11 16:39:55 +08:00
hufangzhou 181b8c78cb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-11 16:31:19 +08:00
hufangzhou 939fab4725 * Task#41242: Make the reviewer not empty when edit the story. Recalculate story status when change the reviewer. 2021-08-11 16:31:14 +08:00
dingguodong 00aaa39dcc * Reformat codes and correct spells for productissues. 2021-08-11 16:20:17 +08:00
dingguodong e6db5a9d96 * Remove trim for get param function in case that int type. 2021-08-11 16:15:43 +08:00