Commit Graph

134 Commits

Author SHA1 Message Date
王怡栋
c1ffbd839a Merge branch 'sprint/liyuchun_devops' into 'master'
Sprint/liyuchun devops

See merge request easycorp/zentaopms!1137
2021-12-29 08:04:37 +00:00
liyuchun
7aff111aa4 * Add action log when create mr. 2021-12-24 13:23:44 +08:00
liyuchun
8b9207537e * Add action log when create mr. 2021-12-24 13:21:12 +08:00
zenggang
4955bd5450 * Fix bug#17909,17910 2021-12-24 02:46:49 +00:00
zenggang
b9e46558c5 * Code for task#46005 2021-12-23 09:21:51 +00:00
caoyanyi
e2f5ad2385 * Modify empty validate. 2021-12-23 05:59:42 +00:00
李玉春
66bf2a0f80 Merge branch 'devops17_wangyidong_api' into 'devops17'
* code for mr diff that is from ztool.

See merge request easycorp/zentaopms!1080
2021-12-22 09:22:08 +00:00
王怡栋
11dc36d278 * code for mr diff that is from ztool. 2021-12-22 17:17:11 +08:00
liyuchun
ca30f986e8 * Adjust code for api create mr. 2021-12-22 17:07:31 +08:00
liyuchun
7e59c27945 * Adjust api create mr. 2021-12-22 16:54:07 +08:00
liyuchun
cdbff35897 * Code for task #46003. 2021-12-22 16:12:03 +08:00
liyuchun
5dd72fd196 * Adjust api create mr. 2021-12-22 09:51:13 +08:00
caoyanyi
7791113e26 * Add create mr by api function. 2021-12-17 06:26:14 +00:00
zenggang
af434d440a * Finish task#46142 2021-12-16 03:12:21 +00:00
zenggang
a34c753438 * Add mr create unit test and adjust code 2021-12-13 09:08:00 +00:00
李玉春
47c4b4e526 Merge branch 'sprint/devops16_wangyidong_test' into 'master'
* code for bug #17438.

See merge request easycorp/zentaopms!915
2021-12-13 08:10:11 +00:00
王怡栋
69023a52bc * code for bug #17438. 2021-12-13 15:24:04 +08:00
李玉春
fd6cc79ea0 Merge branch 'sprint/devops16_17391' into 'master'
* Fix bug#17391

See merge request easycorp/zentaopms!907
2021-12-13 05:51:46 +00:00
zenggang
5726fde3d6 * Fix bug#17391 2021-12-13 03:12:21 +00:00
王怡栋
9fd77be3ef * adjust for upgrade. 2021-12-10 15:44:35 +08:00
王怡栋
bfcb3deb8e * code for task #45676. 2021-12-10 13:30:07 +08:00
李玉春
0ebff09658 Merge branch 'sprint/devops16_wangyidong_45504' into 'sprint/devops16'
Sprint/devops16 wangyidong 45504

See merge request easycorp/zentaopms!857
2021-12-09 07:56:27 +00:00
王怡栋
dc7416ebb4 * adjust code for mr. 2021-12-09 15:54:41 +08:00
王怡栋
cb6dbdf1d1 * fix error for task #45504. 2021-12-09 14:42:14 +08:00
王怡栋
beadf58834 * adjust for bug type for mr. 2021-12-09 13:04:26 +08:00
王怡栋
f1689b4dea * code for task #45504. 2021-12-09 11:24:14 +08:00
zenggang
d5d7e8a578 * Finish task#45440 2021-12-08 05:26:59 +00:00
zenggang
4b53f349df * Fix bug#16736,17037,16844 2021-12-03 01:59:04 +00:00
zenggang
a48f584ca8 * Fix bug#16765,16771 2021-12-02 07:14:31 +00:00
liyuchun
71d27fc151 * Fix error. 2021-12-01 17:23:44 +08:00
liyuchun
f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
liyuchun
38038eb3ad * Fix bug #16956. 2021-12-01 15:12:44 +08:00
zenggang
2e36226f17 * Fix bug#16947 2021-11-30 09:26:24 +00:00
zenggang
5d192a8413 * Fix bug#16764 2021-11-30 06:37:17 +00:00
zenggang
354203e7c9 * Fix bug#16857 2021-11-30 06:14:53 +00:00
liyuchun
ac79294f8d * Fix bug #16920. 2021-11-30 13:36:37 +08:00
zenggang
404a567b73 * Fix bug#16818 2021-11-30 00:53:46 +00:00
zenggang
1b6059c5b3 * Fix bug#16858 2021-11-29 08:41:24 +00:00
zenggang
f837e6af2c * Fix bug#16762 2021-11-29 02:37:38 +00:00
zenggang
6bfdcd4e40 * Adjust mr create logic 2021-11-26 08:12:46 +00:00
liyuchun
0479696334 * Finish task #44798. 2021-11-25 17:23:46 +08:00
xiawenlong
ace43eb90d * Fix code error 2021-11-23 19:11:03 +08:00
zenggang
8d458a0a72 * Finish task#44404 2021-11-23 11:08:15 +00: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
xiawenlong
34df7f8995 fix mr bug 2021-11-19 13:54:55 +08:00
zenggang
95e04b9bf0 * Finish task#44397 2021-11-18 10:27:39 +00:00
xiawenlong
8c1f8ea70c *Finish 44403,44406,44406,44401 2021-11-17 10:53:37 +08:00