Commit Graph

356 Commits

Author SHA1 Message Date
caoyanyi
7eb79b6256 * Fix bug #18932. 2022-01-25 01:38:24 +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
liyuchun
6f03910ea1 * Fix bug #18088. 2021-12-31 10:56:33 +08:00
liyuchun
9d5829d99c * Fix bug #18087. 2021-12-31 09:45:58 +08:00
liyuchun
6107956524 * Fix bug #18087. 2021-12-31 09:42:24 +08:00
liyuchun
c26309ad13 * Fix bug #18087,18092. 2021-12-30 17:49:04 +08:00
liyuchun
930538179b * Fix eroor with special symbols. 2021-12-30 15:18:27 +08:00
liyuchun
1f4ee55810 * Finish task #46544,46556. 2021-12-30 14:05:57 +08:00
zenggang
3bfc8e04c1 * Adjust code 2021-12-30 05:24:37 +00:00
zenggang
bfde525f13 * Finish task#46555 2021-12-30 03:08:42 +00:00
王怡栋
2e7530441b * adjust for task #46552. 2021-12-29 09:49:43 +08:00
liyuchun
b9a2d19393 * Finish task #46140. 2021-12-21 16:55:55 +08:00
zenggang
64646f028d * Adjust code 2021-12-20 09:48:58 +00:00
李玉春
c623ca78ac Merge branch 'devops17' into 'devops17_46138'
# Conflicts:
#   module/gitlab/lang/en.php
#   module/gitlab/lang/zh-cn.php
#   module/group/lang/resource.php
2021-12-20 07:34:35 +00:00
zenggang
54b9265be1 * Finish task#46138 2021-12-17 05:58:48 +00:00
caoyanyi
d9a5f136b1 * Add gitlab tag create function and page. 2021-12-16 05:13:43 +00:00
liyuchun
4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00
李玉春
de158ea32d Merge branch 'sprint/devops16_17301' into 'sprint/devops16'
* Fix bug#17301

See merge request easycorp/zentaopms!894
2021-12-13 03:27:31 +00:00
王怡栋
2d60441372 Merge branch 'sprint/devops16' into 'devops16_caoyanyi_45677'
# Conflicts:
#   module/gitlab/view/browseproject.html.php
2021-12-10 07:40:46 +00:00
caoyanyi
35e55cc75e * Modify data type. 2021-12-10 07:33:24 +00:00
zenggang
203f41745f * Fix bug#17301 2021-12-10 06:44:35 +00:00
caoyanyi
e10c798888 * Add test case for checkAccessLevel. 2021-12-10 02:51:00 +00:00