Commit Graph
26778 Commits
Author SHA1 Message Date
Guan Xiying d5b52bc7ad * Fix viewDiif. 2021-09-07 10:50:34 +08:00
lichengjun b223736b18 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-07 02:38:43 +00:00
lichengjun 12935f3ead * Adjust GitLab MR TODO Detail. 2021-09-07 02:33:36 +00:00
Guan Xiying 7b9cb9ed8e * Remove debug codes. 2021-09-07 10:26:39 +08:00
dingguodong 701b000c09 * Optimize language file. 2021-09-07 10:13:57 +08:00
dingguodong 14c2e282f2 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-07 10:03:34 +08:00
dingguodong ee13e00554 * Add tips for merge code locally. 2021-09-07 10:02:52 +08: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
Guan Xiying 2d1bc4fcc7 * Finish task #41977. 2021-09-06 20:07:04 +08:00
dingguodong 7322869f8d Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-06 17:59:42 +08:00
dingguodong 9d5c1de0ab * Sync MR in ZenTao database whatever status of MR in GitLab. 2021-09-06 17:57:27 +08:00
Guan Xiying cd1a40b066 * Fix job object name in browse page. 2021-09-06 17:45:08 +08:00
Guan Xiying a5ceffb6cf * Fix exec gitlab job bug and adjust exec job function. 2021-09-06 17:29:37 +08:00
Guan Xiying ddfe2479ac * Finish task #41976, adjust exec gitlab function. 2021-09-06 16:46:07 +08:00
Guan Xiying 81795244b3 * Adjust getReferenceOptions function, rename param of function apiCreatePipeline. 2021-09-06 16:44:27 +08:00
lichengjun 7e8705afcd Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-06 05:26:41 +00:00
lichengjun f16eba5b09 * Add GitLab Merge Request Permission configuration. 2021-09-06 05:22:27 +00:00
dingguodong e664627f12 * Add en lang for MR in DevOps menu. 2021-09-06 11:31:56 +08:00
dingguodong 94f4d91107 * Modify en lang for MR. 2021-09-06 11:31:01 +08:00
dingguodong fde5d66e3c * Adjust function comment. 2021-09-03 14:54:35 +08:00
dingguodong 82d9ac3b02 + Add apiGetProjectMembers apiGetProjectMember functions. 2021-09-03 14:52:51 +08:00
dingguodong c80ce42a12 * Reformat code for accept MR. 2021-09-03 13:39:54 +08:00
dingguodong 13506c3cbd * Add locate redirection but test not passed. 2021-09-03 13:37:41 +08:00
dingguodong 7a7c63499f * Fix bug for no response after accept view. 2021-09-03 13:21:14 +08:00
dingguodong 7d83d3110f * Fix bug when sudo as user. 2021-09-03 13:20:53 +08:00
lichengjun 6441a8de44 * Add GitLab MR English Language. 2021-09-03 01:39:33 +00:00
dingguodong 3d360a1e4e * Bug fix and reduce PHP notices. 2021-09-02 16:49:52 +08:00
dingguodong d272eeeefc * Optimize fetching data from API. 2021-09-02 15:39:34 +08:00
dingguodong 1b41b61cee * Using sudo to accept merge request. 2021-09-02 15:21:19 +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
管西迎 bcdee8ef2c Merge branch 'jihuMR' into 'jihuMR'
Finish task#41303

See merge request easycorp/zentaopms!8
2021-09-01 03:15:00 +00:00
dingguodong 5e5cbe2d2f * Update and correct editing a MR. 2021-09-01 11:08:34 +08:00
Guan Xiying ff83efb066 * Add manage reference of gitlab job function. 2021-09-01 10:57:07 +08:00
dingguodong 8b17a74a1c * Update fetching users list when creating a MR. 2021-09-01 10:36:02 +08:00
dingguodong 5ebad79a99 * Fix bug when getting gitlab projects list. 2021-09-01 10:33:55 +08:00
dingguodong e679938379 * Update ajaxGetMRUserPairs function. 2021-09-01 10:29:03 +08:00
dingguodong 3209790874 + Add apiGetProjectUsers function. 2021-09-01 10:28:06 +08:00
dingguodong 761c5d282e * Fix bug when getting gitlab projects list. 2021-09-01 09:40:46 +08:00
dingguodong 33b287b427 - Remove extra lines which should be deleted. 2021-08-31 11:10:50 +08:00
dingguodong 0d11868895 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/dingguodong/zentaopms into jihuMR 2021-08-31 11:06:50 +08:00
dingguodong 1632859faf * Update MR view and lang. 2021-08-31 11:05:22 +08:00
dingguodong 95c2adad70 * Correct apiAcceptMR and update functions. 2021-08-31 11:05:22 +08:00