Commit Graph

60 Commits

Author SHA1 Message Date
dingguodong
9193387eb7 * Fix bug when deleting a MR in ZenTao. 2021-09-09 09:23:02 +08:00
Guan Xiying
d85c93438a * Fix bug #15007. 2021-09-08 23:08:51 +08:00
dingguodong
cf102db743 * Set menu in constructor of every module under devops. 2021-09-08 17:34:17 +08:00
dingguodong
02a2892002 * Fix bug #14994 . 2021-09-08 10:54:50 +08:00
Guan Xiying
b305b8c752 * Fix bug #15009 and change config->MR to config->mr. 2021-09-08 10:13:28 +08:00
dingguodong
6de75d2fcb * Fix bug for sync mr. 2021-09-07 20:17:31 +08:00
dingguodong
74d6b1895a * Update accept MR display style. 2021-09-07 18:12:01 +08:00
dingguodong
4e08891ea9 * Optimize comment. 2021-09-07 15:46:40 +08:00
Guan Xiying
d5b52bc7ad * Fix viewDiif. 2021-09-07 10:50:34 +08:00
lichengjun
7ca5893ce2 * Cancel GitLab SYNC Settings. 2021-09-07 00:44:34 +00: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
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
1b41b61cee * Using sudo to accept merge request. 2021-09-02 15:21:19 +08:00
lichengjun
db552dc428 * Adjust sync gitlab mr code. 2021-09-02 06:13:18 +00:00
dingguodong
5e5cbe2d2f * Update and correct editing a MR. 2021-09-01 11:08:34 +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
b2f1fd3f3c + Accept a MR. 2021-08-31 11:05:03 +08:00
dingguodong
cebaa0cad1 + Accept a MR. 2021-08-31 10:56:41 +08:00
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
567f80f171 * Fix ajaxGetMRTragetProjects and remove and Fix comments. 2021-08-26 17:40:03 +08:00
Guan Xiying
6e3158cc69 * Finish view mr codes diff page. 2021-08-26 14:20:52 +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
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
80c872be80 * Rename mrModel::edit function. 2021-08-23 17:08:03 +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
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
e26c267231 * Add view functions for MR. 2021-08-23 15:03:36 +08:00
dingguodong
807ad4b4e8 * Bug fix for editing a MR. 2021-08-23 10:41:37 +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
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
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