Commit Graph

102 Commits

Author SHA1 Message Date
朱金勇
efdadc07a7 Merge branch 'sprint/176_mayue_45544' into 'master'
* Finish a task #45544.

See merge request easycorp/zentaopms!928
2021-12-14 05:34:42 +00:00
mayue
77d36b7467 * Finish a task #45544. 2021-12-14 09:49:46 +08:00
李玉春
fec4ab4604 Merge branch 'sprint/devops16_wangyidong_test' into 'sprint/devops16'
Sprint/devops16 wangyidong test

See merge request easycorp/zentaopms!888
2021-12-10 07:06:16 +00:00
王怡栋
c0ce88d4fb * fix bug #17352,17349,17347,17346. 2021-12-10 14:02:17 +08:00
liyuchun
d121e2e01a * Fix bug #17293. 2021-12-10 10:11:56 +08:00
王怡栋
f1689b4dea * code for task #45504. 2021-12-09 11:24:14 +08:00
mayue
99e725ef37 * Finish task #45544. 2021-12-08 13:25:50 +08:00
zenggang
42a5e9bf78 * Fix bug#16884,16856 2021-12-02 09:32:45 +00:00
liyuchun
da73e10709 * Fix bug #16856. 2021-12-02 15:32:27 +08:00
liyuchun
c943151157 * Fix bug #16847. 2021-12-02 14:28:50 +08:00
zenggang
e3c4741d1b * Fix bug#16766 2021-12-01 02:47:39 +00:00
zenggang
67a17333a4 * Fix bug#16849 2021-11-30 02:40:59 +00:00
zenggang
5bbcd0bc35 * Fix bug#16849 2021-11-30 02:12:59 +00:00
zenggang
83724a370d * Fix bug#16910,16850 2021-11-30 01:40:07 +00:00
liyuchun
4906d6f51a * Fix bug #16759. 2021-11-30 09:29:35 +08:00
zenggang
32c10ef830 * Fix bug#16756 2021-11-29 06:21:46 +00:00
zenggang
24513b3472 * Fix bug#16769 2021-11-29 03:34:22 +00:00
liyuchun
2b52af1ba4 Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-29 09:48:31 +08:00
liyuchun
ea87d0d644 * Fix bug #16760. 2021-11-29 09:48:20 +08:00
zenggang
a2d0cdb04e * Fix bug#16762 2021-11-29 00:57:31 +00:00
dingguodong
08c61e75ed * Adjust the page of view for MR module. 2021-11-23 20:15:01 +08:00
dingguodong
75d5a01783 * Adjust view page of MR module. 2021-11-23 18:52:49 +08:00
zenggang
699204dc87 * Finish task#44395 2021-11-22 07:20:48 +00:00
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