Commit Graph
33049 Commits
Author SHA1 Message Date
zenggang 5f83afb622 * Unit test and adjust code 2022-01-25 08:33:21 +00:00
李玉春 6766cbe5f0 Merge branch 'devops_caoyanyi' into 'devops20'
* Modify root token check.

See merge request easycorp/zentaopms!1608
2022-01-25 08:27:00 +00:00
caoyanyi 4e1b20e9c8 * Adjust code. 2022-01-25 08:25:40 +00:00
caoyanyi 42c0a2f115 * Modify root token check. 2022-01-25 08:23:28 +00:00
liyuchun 3fee6f256d Merge branch 'devops20' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops20 2022-01-25 14:23:15 +08:00
liyuchun 2b71ad28de * Finish task #48094. 2022-01-25 14:19:24 +08:00
李玉春 7fefd88c06 Merge branch 'devops_caoyanyi_bug' into 'devops20'
* Modify job edit.

See merge request easycorp/zentaopms!1585
2022-01-25 02:44:10 +00:00
李玉春 6507742185 Merge branch 'devops20_zenggang' into 'devops20'
zg:Finish task#48107,48106,48105,48103 and adjust code

See merge request easycorp/zentaopms!1580
2022-01-25 02:43:47 +00:00
zenggang 5183b24bd0 * Adjust code 2022-01-25 02:37:51 +00:00
caoyanyi 7ad4810e93 * Modify job edit. 2022-01-25 02:06:43 +00:00
李玉春 2f35d4f734 Merge branch 'devops_caoyanyi_bug' into 'devops20'
* Fix bug #18932.

See merge request easycorp/zentaopms!1583
2022-01-25 01:44:51 +00:00
caoyanyi 642145cc16 * Modify die to return print. 2022-01-25 01:44:02 +00:00
caoyanyi 7eb79b6256 * Fix bug #18932. 2022-01-25 01:38:24 +00:00
zenggang 216be433d4 * Adjust code 2022-01-25 01:28:07 +00:00
李玉春 fe32b74a27 Merge branch 'devops_caoyanyi_gitlab' into 'devops20'
* Incomplete display of the number of modified files.

See merge request easycorp/zentaopms!1579
2022-01-25 01:14:22 +00:00
zenggang 4ab46cb2ea *Finish task#48107,48106,48105,48103 and adjust code 2022-01-25 01:13:49 +00:00
caoyanyi 44e0b5c2b8 * Incomplete display of the number of modified files. 2022-01-25 01:11:54 +00:00
孙广明 461940c671 Merge branch 'devops20_liyuchun' into 'devops20'
* Finish task #48096.

See merge request easycorp/zentaopms!1567
2022-01-24 09:23:16 +00:00
李玉春 8558dde080 Merge branch 'devops_caoyanyi_bug' into 'devops20'
cyy: Fix bug.

See merge request easycorp/zentaopms!1574
2022-01-24 09:21:59 +00:00
liyuchun eba799b60f * Fix bug #18492. 2022-01-24 17:20:19 +08:00
caoyanyi 5de03afa3a * fix bug #18922. 2022-01-24 09:06:10 +00:00
caoyanyi da20e9dfa8 * Fix bug #18920,18919,18918. 2022-01-24 08:36:47 +00:00
李玉春 39022c7ef3 Merge branch 'devops_caoyanyi' into 'devops20'
* Modify auth check.

See merge request easycorp/zentaopms!1570
2022-01-24 08:21:47 +00:00
caoyanyi c077f9ff4d * Modify auth check. 2022-01-24 08:20:40 +00:00
李玉春 4bc28cb62f Merge branch 'devops_caoyanyi' into 'devops20'
* Modify isset check.

See merge request easycorp/zentaopms!1568
2022-01-24 08:12:54 +00:00
caoyanyi a2a1df2b9e * Modify isset check. 2022-01-24 08:08:24 +00:00
李玉春 480e08f2d0 Merge branch 'devops_caoyanyi' into 'devops20'
Devops caoyanyi

See merge request easycorp/zentaopms!1566
2022-01-24 08:03:00 +00:00
liyuchun acbb957484 * Finish task #48096. 2022-01-24 15:54:27 +08:00
caoyanyi d0b289ed21 * Finish task #48108. 2022-01-24 07:46:22 +00:00
caoyanyi 6e567482e2 * Modify group access. 2022-01-24 07:46:08 +00:00
liyuchun f0907d2f11 * Fix error. 2022-01-24 14:32:31 +08:00
李玉春 033763cceb Merge branch 'devops20_caoyanyi' into 'devops20'
Devops20 caoyanyi

See merge request easycorp/zentaopms!1563
2022-01-24 06:31:27 +00:00
caoyanyi b20110ba68 * Adjust code. 2022-01-24 06:31:00 +00:00
caoyanyi 9f23e540d9 * Modify config data. 2022-01-24 06:26:54 +00:00
caoyanyi 49f393a684 * Remove unused param. 2022-01-24 06:23:17 +00:00
caoyanyi 19af621cdd * Fix bug #18867. 2022-01-24 06:19:34 +00:00
李玉春 ddc2cee664 Merge branch 'devops20_caoyanyi' into 'devops20'
Devops20 caoyanyi

See merge request easycorp/zentaopms!1560
2022-01-24 06:07:03 +00:00
孙广明 a887a9edc3 Merge branch 'devops20_liyuchun' into 'devops20'
* Finish task #48098.

See merge request easycorp/zentaopms!1557
2022-01-24 05:59:45 +00:00
caoyanyi e673ccf33f * Finish task #48099,48097. 2022-01-24 05:53:16 +00:00
caoyanyi 11a30ec207 * Finish task #48100,48102. 2022-01-24 05:40:40 +00:00
liyuchun a567a2e6ea * Finish task #48098. 2022-01-24 13:37:46 +08:00
孙广明 5d32bccec8 Merge branch 'devops20_liyuchun' into 'devops20'
* Check user access.

See merge request easycorp/zentaopms!1552
2022-01-24 05:02:51 +00:00
liyuchun 58a692337a * Check user access. 2022-01-24 10:59:21 +08:00
李玉春 c95b928a54 Merge branch 'devops20_48097' into 'devops20'
* Modify project access check.

See merge request easycorp/zentaopms!1544
2022-01-21 09:20:51 +00:00
caoyanyi a0209a41da * Modify project access check. 2022-01-21 07:04:33 +00:00
李玉春 80134fd1bb Merge branch 'devops20_48104' into 'devops20'
zg:任务48104

See merge request easycorp/zentaopms!1525
2022-01-21 06:35:19 +00:00
zenggang 47e13757a8 * Adjust code 2022-01-21 05:11:52 +00:00
李玉春 0f4d22a7a5 Merge branch 'devops_caoyanyi' into 'devops20'
* Finish task #48109.

See merge request easycorp/zentaopms!1534
2022-01-21 03:07:40 +00:00
liyuchun 13a49268e7 * Adjust check is bind user. 2022-01-21 11:06:58 +08:00
liyuchun 1a26aeba04 * Define gitlab access level. 2022-01-21 10:54:14 +08:00