孙广明
|
9e171958bf
|
Merge branch 'liyuchun_bug_19323' into 'master'
* Fix bug #19323.
See merge request easycorp/zentaopms!1800
|
2022-02-15 05:27:00 +00:00 |
|
liyuchun
|
7c3c7d1662
|
* Fix bug #19383.
|
2022-02-15 08:26:50 +08:00 |
|
caoyanyi
|
7fc3b6d4e9
|
* Modify test case.
|
2022-02-14 15:19:07 +08:00 |
|
liyuchun
|
5583b62fc9
|
Merge branch 'devops21'
|
2022-02-14 10:20:11 +08:00 |
|
caoyanyi
|
583dd0bcd8
|
* Modify data type.
|
2022-02-09 05:28:26 +00:00 |
|
caoyanyi
|
8b2dfe101b
|
* Modify config data.
|
2022-02-09 05:26:27 +00:00 |
|
liyuchun
|
8ed093d0fe
|
* Fix bug.
|
2022-02-09 12:59:50 +08:00 |
|
caoyanyi
|
cd560f74b3
|
* Finish task #48614.
|
2022-02-08 05:39:57 +00:00 |
|
caoyanyi
|
894237885c
|
* Adjust code.
|
2022-01-27 03:20:43 +00:00 |
|
caoyanyi
|
8e2db7b2cb
|
* Add testcase.
|
2022-01-27 03:15:48 +00:00 |
|
zenggang
|
9d35e580eb
|
*Adjust code
|
2022-01-26 02:03:36 +00:00 |
|
zenggang
|
ce37bf9985
|
* Fix bug#18978
|
2022-01-26 01:58:00 +00:00 |
|
liyuchun
|
d95187f42b
|
* Fix error.
|
2022-01-26 09:01:40 +08:00 |
|
caoyanyi
|
efbb0fa13e
|
* Modify gitlab group access.
|
2022-01-26 00:46:20 +00:00 |
|
liyuchun
|
555fbaddef
|
Merge branch 'devops20'
|
2022-01-25 16:55:51 +08: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 |
|
李玉春
|
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
|
7eb79b6256
|
* Fix bug #18932.
|
2022-01-25 01:38:24 +00:00 |
|
zenggang
|
4ab46cb2ea
|
*Finish task#48107,48106,48105,48103 and adjust code
|
2022-01-25 01:13:49 +00: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 |
|
caoyanyi
|
6e567482e2
|
* Modify group access.
|
2022-01-24 07:46:08 +00: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
|
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 |
|
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 |
|
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 |
|
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 |
|
zenggang
|
36c97752b4
|
* Finish task#48104
|
2022-01-20 09:25:44 +00:00 |
|
李玉春
|
7942d9a886
|
Merge branch 'devops20' into 'devops_caoyanyi'
# Conflicts:
# module/gitlab/model.php
|
2022-01-20 06:10:57 +00:00 |
|
caoyanyi
|
f87294adf7
|
* Modify page error.
|
2022-01-20 05:37:33 +00:00 |
|
liyuchun
|
b9c90fcd25
|
* Adjust bind user.
|
2022-01-20 13:27:31 +08:00 |
|
liyuchun
|
c561a9b666
|
* Add sudo in gitlab api url.
|
2022-01-20 13:11:40 +08:00 |
|
liyuchun
|
818a1d7332
|
* Fix bug #17956.
|
2022-01-05 11:20:43 +08:00 |
|
王怡栋
|
a4ed3b0319
|
Merge branch 'sprint/liyuchun_devops18' into 'master'
* Add unit cases.
See merge request easycorp/zentaopms!1251
|
2022-01-04 07:18:49 +00:00 |
|
liyuchun
|
a6f469e461
|
* Add unit cases.
|
2022-01-04 15:10:28 +08:00 |
|
Hao Sun
|
a9cc771d85
|
Revert "Revert "Merge branch 'devops18_caoyanyi' into 'master'""
This reverts commit 3a0ec82016.
|
2021-12-31 17:35:39 +08:00 |
|
Hao Sun
|
3a0ec82016
|
Revert "Merge branch 'devops18_caoyanyi' into 'master'"
This reverts commit 41004048b2, reversing
changes made to 86fb6e2680.
|
2021-12-31 17:22:32 +08:00 |
|
李玉春
|
41004048b2
|
Merge branch 'devops18_caoyanyi' into 'master'
* Modify test case for apiCreateBranchPriv.
See merge request easycorp/zentaopms!1236
|
2021-12-31 07:54:26 +00:00 |
|
caoyanyi
|
401d793532
|
* Modify test case for apiCreateBranchPriv.
|
2021-12-31 07:33:58 +00:00 |
|
zenggang
|
031c8e03a9
|
* Add unit test
|
2021-12-31 05:56:16 +00:00 |
|