Commit Graph
350 Commits
Author SHA1 Message Date
liyuchun c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
王怡栋 05bb5b46b8 * fix bug #18111. 2021-12-31 10:31:58 +08:00
王怡栋 f895777dec * adjust for z tool. 2021-12-31 09:54:58 +08:00
王怡栋 2f86ca39d8 Merge branch 'devops18_liyuchun' into 'devops18'
Fix bug #18078.

See merge request easycorp/zentaopms!1211
2021-12-30 08:15:53 +00:00
liyuchun 55c7c7e848 * Fix bug #18078. 2021-12-30 16:13:40 +08:00
liyuchun b45ec10f40 * Fix bug #18078. 2021-12-30 15:36:33 +08:00
李玉春 26621179fd Merge branch 'devops18_wangyidong_46553' into 'devops18'
* fix error.

See merge request easycorp/zentaopms!1206
2021-12-30 07:30:53 +00:00
王怡栋 0552eec334 * fix error. 2021-12-30 15:19:59 +08:00
李玉春 07756750db Merge branch 'devops18_46555' into 'devops18'
* Finish task#46555

See merge request easycorp/zentaopms!1189
2021-12-30 05:33:10 +00:00
zenggang bfde525f13 * Finish task#46555 2021-12-30 03:08:42 +00:00
王怡栋 7c5be1093e * adjust code task #46553. 2021-12-30 10:38:01 +08:00
王怡栋 134cd55f46 * adjust for task #46553. 2021-12-30 10:31:19 +08:00
王怡栋 061bf4388c * adjust for unit test. 2021-12-30 10:08:00 +08:00
王怡栋 625a6a47c4 * code for task #46553. 2021-12-30 08:38:54 +08:00
王怡栋 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
李玉春 7d8aa9da78 Merge branch 'devops18_46549' into 'devops18'
* Finish task#46549

See merge request easycorp/zentaopms!1175
2021-12-29 03:19:45 +00:00
liyuchun b9c8bd4afd * Fix error when change source project. 2021-12-29 10:45:05 +08:00
zenggang 8e4cfa8744 * Finish task#46549 2021-12-29 02:29:19 +00:00
王怡栋 3a6e39f834 Merge branch 'sprint/liyuchun_devops18' into 'devops18'
* Finish task #46551.

See merge request easycorp/zentaopms!1174
2021-12-29 02:25:31 +00:00
liyuchun 8e98e9831e * Finish task #46551. 2021-12-29 10:02:25 +08:00
李玉春 4270c776f1 Merge branch 'devops18_wangyidong_46552' into 'devops18'
Devops18 wangyidong 46552

See merge request easycorp/zentaopms!1173
2021-12-29 01:51:53 +00:00
王怡栋 2e7530441b * adjust for task #46552. 2021-12-29 09:49:43 +08:00
王怡栋 0ba53391eb * adjust for error. 2021-12-29 08:36:58 +08:00
王怡栋 2a4c3cfa0e * code for task #46552. 2021-12-28 16:55:35 +08:00
李玉春 03c38f01c9 Merge branch 'devops17_17941' into 'devops18'
* Fix bug#17941

See merge request easycorp/zentaopms!1143
2021-12-28 07:54:01 +00:00
liyuchun 9da21e20f0 * Finish task #46550. 2021-12-28 15:45:09 +08:00
王怡栋 667cf60e42 * code for task #46552. 2021-12-28 15:16:08 +08:00
liyuchun dc46e684fe * Fix bug #18023. 2021-12-28 14:10:59 +08:00
zenggang 01bfc4f928 * Fix bug#17941 2021-12-24 08:24:05 +00:00
hufangzhou 4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08: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
liyuchun aba26e05ac * Add unit testcase of delete tag. 2021-12-23 17:00:24 +08:00
liyuchun da283574bb * Fix errors. 2021-12-23 15:04:53 +08:00
王怡栋 8b14f70b30 Merge branch 'devops17_caoyanyi_test' into 'devops17'
Devops17 caoyanyi test

See merge request easycorp/zentaopms!1104
2021-12-23 06:02:46 +00:00
caoyanyi 8ebdeefebf * Add auth and language. 2021-12-23 05:59:54 +00:00
caoyanyi e2f5ad2385 * Modify empty validate. 2021-12-23 05:59:42 +00:00
liyuchun 51d75e0802 * Fix bug #17841,17830. 2021-12-23 09:20:40 +08: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
王怡栋 a1406ac51e Merge branch 'sprint/devops17_liyuchun' into 'devops17'
Sprint/devops17 liyuchun

See merge request easycorp/zentaopms!1079
2021-12-22 09:20:33 +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
王怡栋 0682282971 Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Code for task #46003.

See merge request easycorp/zentaopms!1077
2021-12-22 08:16:40 +00:00
liyuchun e10a7875f7 * Adjust code for task #46003. 2021-12-22 16:15:49 +08:00
liyuchun cdbff35897 * Code for task #46003. 2021-12-22 16:12:03 +08:00
zenggang 5751dd0783 * Fix bug#17846 2021-12-22 07:17:31 +00:00
李玉春 7d8dbf5db8 Merge branch 'devops17_46005' into 'devops17'
* Finish task#46005

See merge request easycorp/zentaopms!1051
2021-12-22 03:00:47 +00:00