Commit Graph
31258 Commits
Author SHA1 Message Date
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
王怡栋 86f2f47ceb Merge branch 'devops17_caoyanyi_test' into 'devops17'
* Add test case for create mr by api.

See merge request easycorp/zentaopms!1096
2021-12-23 05:02:53 +00:00
caoyanyi 6caf242a80 * Add test case for create mr by api. 2021-12-23 03:29:27 +00:00
王怡栋 49c3e04818 Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Fix bug #17811.

See merge request easycorp/zentaopms!1087
2021-12-23 02:08:47 +00:00
liyuchun 57deb67041 * Fix bug #17811. 2021-12-23 10:02:57 +08:00
王怡栋 becda9cbe0 Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Fix bug #17841,17830.

See merge request easycorp/zentaopms!1083
2021-12-23 01:25:26 +00:00
李玉春 80455b5ed9 Merge branch 'devops17_46005' into 'devops17'
* Code for task#46005

See merge request easycorp/zentaopms!1081
2021-12-23 01:23:13 +00:00
liyuchun 51d75e0802 * Fix bug #17841,17830. 2021-12-23 09:20:40 +08:00
zenggang 4c96f9d833 * Code for task#46005 2021-12-23 01:02:23 +00:00
李玉春 36a1c2e6af Merge branch 'devops17_mr_update' into 'devops17'
Devops17 mr update

See merge request easycorp/zentaopms!1075
2021-12-23 00:49:55 +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
王怡栋 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
王怡栋 40d37f91f9 Merge branch 'devops17_caoyanyi_bug' into 'devops17'
* Remove empty.

See merge request easycorp/zentaopms!1078
2021-12-22 09:10:44 +00:00
caoyanyi 80ce63d880 * Remove empty. 2021-12-22 09:09:29 +00: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 b164538b75 * Adjust code 2021-12-22 08:11:38 +00:00
李玉春 9126094ec3 Merge branch 'devops17_17846' into 'devops17'
* Fix bug#17846

See merge request easycorp/zentaopms!1069
2021-12-22 08:07:29 +00:00
zenggang ca1f1e645b * Add mr update unit 2021-12-22 07:49:49 +00:00
李玉春 3de88dbf10 Merge branch 'devops17_wangyidong_api' into 'devops17'
* adjust for vs code and php8.0.

See merge request easycorp/zentaopms!1070
2021-12-22 07:28:15 +00:00
王怡栋 49bfd2dd18 * adjust for vs code and php8.0. 2021-12-22 15:24:47 +08:00
zenggang 5751dd0783 * Fix bug#17846 2021-12-22 07:17:31 +00:00
李玉春 c77fbcadb3 Merge branch 'devops17_17751' into 'devops17'
Devops17 17751

See merge request easycorp/zentaopms!1057
2021-12-22 03:21:47 +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
zenggang cb1c14b98b * Adjust code style 2021-12-22 02:59:57 +00:00
zenggang b921ba7679 * Fix bug#17751 2021-12-22 02:05:14 +00:00
zenggang f66c50d9db * Fix bug#17751 2021-12-22 02:03:35 +00:00
王怡栋 71df92bee6 Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Adjust api create mr.

See merge request easycorp/zentaopms!1056
2021-12-22 01:53:51 +00:00
王怡栋 005e5980d6 Merge branch 'devops17_caoyanyi_mr' into 'devops17'
* Add sql.

See merge request easycorp/zentaopms!1055
2021-12-22 01:52:26 +00:00
liyuchun 5dd72fd196 * Adjust api create mr. 2021-12-22 09:51:13 +08:00
zenggang c854ab0e33 * Add apigettags method unit 2021-12-22 01:01:17 +00:00
zenggang 4ae4c69ea4 * Finish task#46005 2021-12-22 00:54:44 +00:00
李玉春 155b3125db Merge branch 'devops17_wangyidong_api' into 'devops17'
* adjust for get repo rules api.

See merge request easycorp/zentaopms!1047
2021-12-21 09:46:56 +00:00
王怡栋 2eac7ba0d1 * adjust for get repo rules api. 2021-12-21 17:42:38 +08:00
王怡栋 2f620a8662 Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Finish task #46140.

See merge request easycorp/zentaopms!1042
2021-12-21 09:29:32 +00:00
liyuchun b9a2d19393 * Finish task #46140. 2021-12-21 16:55:55 +08:00
caoyanyi 54b6dd0ffc * Add sql. 2021-12-21 08:06:10 +00:00
王怡栋 97bbefbd09 * adjust for update sql. 2021-12-21 15:28:40 +08:00
王怡栋 b7ce8814fb Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Code for task #46001.

See merge request easycorp/zentaopms!1035
2021-12-21 07:27:35 +00:00
liyuchun 4508fec3a3 * Adjust annotation. 2021-12-21 15:26:31 +08:00
王怡栋 075856775b Merge branch 'devops17' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops17 2021-12-21 14:26:20 +08:00
王怡栋 29daabbb57 * add unit test case for repo getrepobyurl. 2021-12-21 14:24:48 +08:00
王怡栋 199443ccb3 Merge branch 'devops17_caoyanyi_bug' into 'devops17'
* Modify placeholder.

See merge request easycorp/zentaopms!1032
2021-12-21 06:18:15 +00:00