Commit Graph
129 Commits
Author SHA1 Message Date
zenggang 2e677116d7 * Finish task#44399 2021-11-22 02:57:11 +00:00
zenggang 7c6a0b0e4e * Finish task#44402 2021-11-19 08:19:21 +00:00
zenggang 15ce4de1e4 * Finish task#44398 2021-11-19 06:36:47 +00:00
zenggang 95e04b9bf0 * Finish task#44397 2021-11-18 10:27:39 +00:00
dingguodong 2d9d95cc98 * Correct or Optimize codes to meet code styles. 2021-11-16 10:46:48 +08:00
dingguodong 48fff67403 * Optimize browsing the merge requests. 2021-11-12 10:39:18 +08:00
dingguodong 6ce5b1de33 * Correct bad code style and resolve others. 2021-11-11 17:24:09 +08:00
dingguodong 0eaa75267f * Correct the browse link in MR module. 2021-11-11 10:30:40 +08:00
dingguodong b9a2673f5a * Correct the issue that when the MR is deleted in GitLab. 2021-11-10 17:39:12 +08:00
dingguodong 51960d25b4 Finish task#43858. review code in diff view of MR module. 2021-11-10 15:07:03 +08:00
dingguodong 58aef31f15 * Finish task#44144. 2021-11-09 18:18:06 +08:00
dingguodong 8e4bf08e4f * Finish task#43855. Approval page issue is fixed. 2021-11-09 16:21:08 +08:00
dingguodong efb3a369c8 * Add compile status of job when creating a MR. 2021-11-09 12:10:03 +08:00
dingguodong 1e931339ef * Get latest MR when viewing it in ZenTaoPMS. 2021-11-08 15:32:07 +08:00
dingguodong cc14a18799 * Add approval for MR(Optimization is required). 2021-11-08 11:37:06 +08:00
dingguodong 2155948d19 * Add approve function for MR module. 2021-11-05 13:47:57 +08:00
dingguodong 3bce793b94 * Optimize view MR and prepare for approve MR. 2021-11-04 16:03:20 +08:00
dingguodong bdcf454239 * Implement view diffs in MR module. 2021-11-03 17:53:14 +08:00
dingguodong 074d13aa20 * Correct malformed codes and create sugon branch. 2021-11-03 08:53:18 +08:00
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