 王怡栋
|
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
|
e32a694e08
|
* Adjust code.
|
2021-12-10 07:38:21 +00:00 |
|
|
caoyanyi
|
35e55cc75e
|
* Modify data type.
|
2021-12-10 07:33:24 +00:00 |
|
|
李玉春
|
fec4ab4604
|
Merge branch 'sprint/devops16_wangyidong_test' into 'sprint/devops16'
Sprint/devops16 wangyidong test
See merge request easycorp/zentaopms!888
|
2021-12-10 07:06:16 +00:00 |
|
|
王怡栋
|
49cd37e6de
|
* code task #45436.
|
2021-12-10 14:38:08 +08:00 |
|
|
王怡栋
|
36be7f468c
|
* code for task #17340.
|
2021-12-10 14:14:25 +08:00 |
|
|
王怡栋
|
c0ce88d4fb
|
* fix bug #17352,17349,17347,17346.
|
2021-12-10 14:02:17 +08:00 |
|
|
王怡栋
|
82689e7af4
|
* adjust code for test.
|
2021-12-10 13:35:37 +08:00 |
|
|
caoyanyi
|
4975843c4f
|
* Adjust codes.
|
2021-12-10 05:32:23 +00:00 |
|
|
王怡栋
|
bfcb3deb8e
|
* code for task #45676.
|
2021-12-10 13:30:07 +08:00 |
|
|
caoyanyi
|
e10c798888
|
* Add test case for checkAccessLevel.
|
2021-12-10 02:51:00 +00:00 |
|
|
caoyanyi
|
435f972c8c
|
* Add test case for apiDeleteBranchPriv.
|
2021-12-10 02:18:44 +00:00 |
|
|
王怡栋
|
b82a451b11
|
Merge branch 'sprint/liyuchun_17293' into 'sprint/devops16'
* Fix bug #17293.
See merge request easycorp/zentaopms!878
|
2021-12-10 02:14:07 +00:00 |
|
|
liyuchun
|
d121e2e01a
|
* Fix bug #17293.
|
2021-12-10 10:11:56 +08:00 |
|
|
caoyanyi
|
ddae5d5c76
|
* Add test case for apiGetSingleBranchPriv.
|
2021-12-10 02:07:03 +00:00 |
|
|
王怡栋
|
9578ff1eba
|
Merge branch 'sprint/liyuchun_17298' into 'sprint/devops16'
* Fix bug #17298.
See merge request easycorp/zentaopms!877
|
2021-12-10 02:03:30 +00:00 |
|
|
liyuchun
|
41b90898ee
|
* Fix bug #17298.
|
2021-12-10 09:59:43 +08:00 |
|
|
caoyanyi
|
55c61f9ee7
|
* Add test case for create model.
|
2021-12-10 01:49:30 +00:00 |
|
|
王怡栋
|
4ca00009d5
|
Merge branch 'sprint/devops_liyuchun_45443' into 'sprint/devops16'
* Fix bug #17343, Finish task #45443.
See merge request easycorp/zentaopms!876
|
2021-12-10 01:48:01 +00:00 |
|
|
liyuchun
|
0ab14d8df2
|
* Fix bug #17343, Finish task #45443.
|
2021-12-10 09:42:21 +08:00 |
|
|
caoyanyi
|
beef8858bc
|
* Add test case for create api.
|
2021-12-10 01:28:32 +00:00 |
|
|
caoyanyi
|
e662d49ab1
|
* Add test case for api create.
|
2021-12-10 01:27:44 +00:00 |
|
|
李玉春
|
8e4803745c
|
Merge branch 'sprint/devops16_45445' into 'sprint/devops16'
* Adjust code
See merge request easycorp/zentaopms!867
|
2021-12-10 01:02:17 +00:00 |
|
|
liyuchun
|
ddc651efbb
|
* Code for task #45445.
|
2021-12-10 09:01:31 +08:00 |
|
|
liyuchun
|
802f13b4db
|
Merge branch 'sprint/devops16_wangyidong_45438' into sprint/devops16
|
2021-12-10 08:26:37 +08:00 |
|
|
liyuchun
|
33e92f4e21
|
Merge branch 'sprint/devops16' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops16
|
2021-12-10 08:26:02 +08:00 |
|
|
liyuchun
|
6b295805b9
|
* Finish task #45675.
|
2021-12-10 08:24:49 +08:00 |
|
|
李玉春
|
5338fcd4db
|
Merge branch 'sprint/devops16' into 'sprint/devops16_wangyidong_45438'
# Conflicts:
# module/gitlab/js/managegroupmembers.js
|
2021-12-10 00:24:19 +00:00 |
|
|
王怡栋
|
73d308b0e2
|
* code for task #45436.
|
2021-12-09 17:58:18 +08:00 |
|
|
王怡栋
|
760cfb42be
|
Merge branch 'sprint/devops_liyuchun_45441' into 'sprint/devops16'
* Finish task #45439.
See merge request easycorp/zentaopms!852
|
2021-12-09 09:24:55 +00:00 |
|
|
王怡栋
|
068eeee4e8
|
* code for task #45435.
|
2021-12-09 17:14:36 +08:00 |
|
|
caoyanyi
|
6bdd9038cf
|
* Add error return.
|
2021-12-09 09:10:18 +00:00 |
|
|
zenggang
|
dcc9200457
|
* Adjust code
|
2021-12-09 09:01:02 +00:00 |
|
|
caoyanyi
|
c6c8f8de15
|
* Modify icon.
|
2021-12-09 08:50:30 +00:00 |
|
|
王怡栋
|
e3e5325efb
|
* code for task #45436.
|
2021-12-09 16:49:46 +08:00 |
|
|
李玉春
|
730e5f6491
|
Merge branch 'sprint/devops16_17141' into 'sprint/devops16'
* Fix bug#17141
See merge request easycorp/zentaopms!861
|
2021-12-09 08:38:47 +00:00 |
|
|
王怡栋
|
43555ed066
|
* code for task #45436.
|
2021-12-09 16:31:51 +08:00 |
|
|
王怡栋
|
91faac255a
|
* code for task #45438,45437.
|
2021-12-09 16:10:17 +08:00 |
|
|
李玉春
|
0ebff09658
|
Merge branch 'sprint/devops16_wangyidong_45504' into 'sprint/devops16'
Sprint/devops16 wangyidong 45504
See merge request easycorp/zentaopms!857
|
2021-12-09 07:56:27 +00:00 |
|
|
王怡栋
|
dc7416ebb4
|
* adjust code for mr.
|
2021-12-09 15:54:41 +08:00 |
|
|
zenggang
|
fe5571a0ed
|
* Fix bug#17141
|
2021-12-09 07:46:07 +00:00 |
|
|
王怡栋
|
c4dd3a4954
|
Merge branch 'sprint/devops16' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/devops16
|
2021-12-09 15:40:55 +08:00 |
|
|
王怡栋
|
c09fcb0c15
|
Merge branch 'devops16_caoyanyi_45499' into sprint/devops16
|
2021-12-09 15:40:44 +08:00 |
|
|
李玉春
|
40c3eb41e8
|
Merge branch 'sprint/devops16_unit' into 'sprint/devops16'
* Add pipeline data and apigetbranches model method
See merge request easycorp/zentaopms!858
|
2021-12-09 07:26:41 +00:00 |
|
|
caoyanyi
|
ca73678ccd
|
* Modify comment.
|
2021-12-09 07:15:45 +00:00 |
|
|
caoyanyi
|
8cb4c2a94c
|
* Add comment.
|
2021-12-09 07:14:02 +00:00 |
|
|
caoyanyi
|
c2513ccc92
|
* Adjust codes.
|
2021-12-09 07:12:35 +00:00 |
|
|
zenggang
|
6985783f0a
|
* Add pipeline data and apigetbranches model method
|
2021-12-09 06:57:48 +00:00 |
|
|
caoyanyi
|
60e6727f35
|
* Add mouseover title.
|
2021-12-09 06:48:32 +00:00 |
|
|
王怡栋
|
cb6dbdf1d1
|
* fix error for task #45504.
|
2021-12-09 14:42:14 +08:00 |
|