52 Commits

Include renames

Author	SHA1	Message	Date
caoyanyi	78e6133a0f	* Adjust codes.	2022-07-25 10:37:59 +08:00
caoyanyi	f8cd6fe1cb	* Finish task #61811,61812.	2022-07-25 09:43:53 +08:00
caoyanyi	2ef6ab7949	* Fix bug #25543.	2022-07-21 10:01:49 +08:00
caoyanyi	07465a327d	* Modify merge request view.	2022-07-19 17:04:12 +08:00
zhouxudong	532920579e	* Fix bug #20178.	2022-04-18 13:20:44 +08:00
zhouxudong	9f50c3abaa	* Fix bug #20178.	2022-04-18 11:18:33 +08:00
caoyanyi	9b8743c494	* Modify mr view style.	2022-01-26 08:40:55 +00:00
liyuchun	b6bf9f253d	* Fix error in mr view.	2022-01-26 10:49:57 +08:00
李玉春	39e8a3fae7	Revert "Merge branch 'devops_caoyanyi' into 'master'" ... This reverts merge request !1515	2022-01-20 05:42:05 +00:00
caoyanyi	f87294adf7	* Modify page error.	2022-01-20 05:37:33 +00:00
zenggang	4b0d2e842a	* Fix bug#18456,18393,18392	2022-01-17 06:49:36 +00:00
zenggang	a87d365a09	* Fix bug#18277	2022-01-07 03:03:44 +00:00
liyuchun	55c7c7e848	* Fix bug #18078.	2021-12-30 16:13:40 +08:00
zenggang	4955bd5450	* Fix bug#17909,17910	2021-12-24 02:46:49 +00:00
zenggang	b9e46558c5	* Code for task#46005	2021-12-23 09:21:51 +00:00
liyuchun	aba26e05ac	* Add unit testcase of delete tag.	2021-12-23 17:00:24 +08:00
liyuchun	da283574bb	* Fix errors.	2021-12-23 15:04:53 +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	cdbff35897	* Code for task #46003.	2021-12-22 16:12:03 +08:00
zenggang	5751dd0783	* Fix bug#17846	2021-12-22 07:17:31 +00:00
李玉春	30acf3d2a7	Merge branch 'devops17' into 'devops17_wangyidong_46002' ... # Conflicts: # db/update16.0.beta1.sql	2021-12-21 03:19:16 +00:00
caoyanyi	9e08030544	* Modify conflict status.	2021-12-17 07:52:19 +00:00
王怡栋	1a66159617	* code for task #46002.	2021-12-17 08:47:23 +08:00
liyuchun	07ce01bda2	* Finish task #45439.	2021-12-09 12:28:32 +08:00
zenggang	f619cf0341	* Adjust mr view button	2021-12-03 03:09:37 +00:00
zenggang	42a5e9bf78	* Fix bug#16884,16856	2021-12-02 09:32:45 +00:00
liyuchun	da73e10709	* Fix bug #16856.	2021-12-02 15:32:27 +08:00
liyuchun	38038eb3ad	* Fix bug #16956.	2021-12-01 15:12:44 +08:00
zenggang	a69162e260	* Fix bug#16777	2021-12-01 05:12:40 +00:00
liyuchun	e9baf564e7	* Fix bug #16852.	2021-12-01 10:43:13 +08:00
zenggang	6dc4aeb458	* Fix bug#16774	2021-11-30 05:59:03 +00:00
liyuchun	4906d6f51a	* Fix bug #16759.	2021-11-30 09:29:35 +08:00
zenggang	b0e125a4ad	* Fix bug#16763	2021-11-29 02:27:03 +00:00
liyuchun	ea87d0d644	* Fix bug #16760.	2021-11-29 09:48:20 +08:00
Guan Xiying	ba8ae82bbc	* Fix links in tab nav of mr view page.	2021-11-24 11:27:32 +08:00
Guan Xiying	32a0795e8e	* Adjust style of view mr page.	2021-11-24 09:48:20 +08:00
Guan Xiying	1f2fa3e96d	* Adjust style of mr view.	2021-11-23 20:16:59 +08:00
Guan Xiying	bcb70c304e	* Adjust view header.	2021-11-23 20:08:16 +08:00
dingguodong	75d5a01783	* Adjust view page of MR module.	2021-11-23 18:52:49 +08:00
zenggang	15ce4de1e4	* Finish task#44398	2021-11-19 06:36:47 +00:00
dingguodong	6ce5b1de33	* Correct bad code style and resolve others.	2021-11-11 17:24:09 +08:00
dingguodong	b9a2673f5a	* Correct the issue that when the MR is deleted in GitLab.	2021-11-10 17:39:12 +08:00
dingguodong	8e4bf08e4f	* Finish task#43855. Approval page issue is fixed.	2021-11-09 16:21:08 +08:00
dingguodong	53d263c3c6	* Close and Reopen MR.	2021-11-08 15:33:39 +08:00
dingguodong	cc14a18799	* Add approval for MR(Optimization is required).	2021-11-08 11:37:06 +08:00
dingguodong	2155948d19	* Add approve function for MR module.	2021-11-05 13:47:57 +08:00
dingguodong	2acf4c98db	* Optimize merge request status in view page of MR module.	2021-11-04 10:21:17 +08:00
dingguodong	74d6b1895a	* Update accept MR display style.	2021-09-07 18:12:01 +08:00
dingguodong	1632859faf	* Update MR view and lang.	2021-08-31 11:05:22 +08:00
Guan Xiying	2d6419c497	* Adjust style of pipeline status.	2021-08-26 16:58:29 +08:00