lichengjun
|
d2a348b57b
|
Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR
|
2021-09-01 07:03:04 +00:00 |
|
lichengjun
|
7f71a63468
|
* Sync GitLab Todo ZenTao Todo.
|
2021-09-01 07:02:17 +00:00 |
|
管西迎
|
bcdee8ef2c
|
Merge branch 'jihuMR' into 'jihuMR'
Finish task#41303
See merge request easycorp/zentaopms!8
|
2021-09-01 03:15:00 +00:00 |
|
dingguodong
|
5e5cbe2d2f
|
* Update and correct editing a MR.
|
2021-09-01 11:08:34 +08:00 |
|
Guan Xiying
|
ff83efb066
|
* Add manage reference of gitlab job function.
|
2021-09-01 10:57:07 +08:00 |
|
dingguodong
|
8b17a74a1c
|
* Update fetching users list when creating a MR.
|
2021-09-01 10:36:02 +08:00 |
|
dingguodong
|
5ebad79a99
|
* Fix bug when getting gitlab projects list.
|
2021-09-01 10:33:55 +08:00 |
|
dingguodong
|
e679938379
|
* Update ajaxGetMRUserPairs function.
|
2021-09-01 10:29:03 +08:00 |
|
dingguodong
|
3209790874
|
+ Add apiGetProjectUsers function.
|
2021-09-01 10:28:06 +08:00 |
|
dingguodong
|
761c5d282e
|
* Fix bug when getting gitlab projects list.
|
2021-09-01 09:40:46 +08:00 |
|
dingguodong
|
33b287b427
|
- Remove extra lines which should be deleted.
|
2021-08-31 11:10:50 +08:00 |
|
dingguodong
|
0d11868895
|
Merge branch 'jihuMR' of https://gitlab.zcorp.cc/dingguodong/zentaopms into jihuMR
|
2021-08-31 11:06:50 +08:00 |
|
dingguodong
|
1632859faf
|
* Update MR view and lang.
|
2021-08-31 11:05:22 +08:00 |
|
dingguodong
|
95c2adad70
|
* Correct apiAcceptMR and update functions.
|
2021-08-31 11:05:22 +08:00 |
|
dingguodong
|
b2f1fd3f3c
|
+ Accept a MR.
|
2021-08-31 11:05:03 +08:00 |
|
dingguodong
|
587dd38b63
|
* Update MR view and lang.
|
2021-08-31 11:01:29 +08:00 |
|
dingguodong
|
df881ebb35
|
* Correct apiAcceptMR and update functions.
|
2021-08-31 10:57:17 +08:00 |
|
dingguodong
|
cebaa0cad1
|
+ Accept a MR.
|
2021-08-31 10:56:41 +08:00 |
|
lichengjun
|
99fdb29327
|
* Adjust GitLab view html.
|
2021-08-30 07:04:48 +00:00 |
|
lichengjun
|
95ea397519
|
* Add GitLab view html.
|
2021-08-30 06:55:05 +00:00 |
|
lichengjun
|
8f4cfb67da
|
* Add Sync MR from GitLab API to Zentao database, default time 5 minutes to execute once.
|
2021-08-30 06:52:02 +00:00 |
|
丁国栋
|
1b73c952ec
|
Merge branch 'jihuMR' into 'jihuMR'
* Fix bug when creating a repo without gitlabProject.
See merge request easycorp/zentaopms!7
|
2021-08-27 09:48:39 +00:00 |
|
dingguodong
|
033ffbb3ed
|
* Fix bug when creating a repo without gitlabProject.
|
2021-08-27 17:37:28 +08:00 |
|
lichengjun
|
2b03f84fe4
|
* Adjust GitLab browse template.
|
2021-08-27 08:10:04 +00:00 |
|
lichengjun
|
4cd4dd6a3d
|
* Add GitLab view template and control view function.
|
2021-08-27 07:36:48 +00:00 |
|
Guan Xiying
|
0a56e0100e
|
* Fix comments.
|
2021-08-26 17:45:16 +08:00 |
|
Guan Xiying
|
8c32895ad8
|
* Fix comments.
|
2021-08-26 17:44:44 +08:00 |
|
Guan Xiying
|
1160e1eba7
|
* Use common::printLink and remove extra comments.
|
2021-08-26 17:44:06 +08:00 |
|
Guan Xiying
|
03b9fd3982
|
* Add apiError->createMR lang item.
|
2021-08-26 17:43:10 +08:00 |
|
Guan Xiying
|
cfd56b03f0
|
* Remove processMR function, Adjust api error message.
|
2021-08-26 17:41:35 +08:00 |
|
Guan Xiying
|
3110a903c3
|
* Fix ajaxGetMRTragetProjects.
|
2021-08-26 17:41:13 +08:00 |
|
Guan Xiying
|
567f80f171
|
* Fix ajaxGetMRTragetProjects and remove and Fix comments.
|
2021-08-26 17:40:03 +08:00 |
|
Guan Xiying
|
ed95aa5dbd
|
* Fix rignt spell error.
|
2021-08-26 17:08:09 +08:00 |
|
Guan Xiying
|
2d6419c497
|
* Adjust style of pipeline status.
|
2021-08-26 16:58:29 +08:00 |
|
Guan Xiying
|
0a88f13f16
|
- Delete list.html.php .
|
2021-08-26 16:46:47 +08:00 |
|
Guan Xiying
|
9b1ca198bc
|
* Adjust style of view MR page.
|
2021-08-26 16:45:29 +08:00 |
|
Guan Xiying
|
7239c66129
|
* Add js file of mr diff page.
|
2021-08-26 14:22:19 +08:00 |
|
Guan Xiying
|
6e3158cc69
|
* Finish view mr codes diff page.
|
2021-08-26 14:20:52 +08:00 |
|
lichengjun
|
38c327927f
|
* Adjust GitLab history log.
|
2021-08-26 05:49:38 +00:00 |
|
Guan Xiying
|
eef945755f
|
* Add diff page.
|
2021-08-25 10:36:18 +08:00 |
|
Guan Xiying
|
754163aae4
|
Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR
|
2021-08-25 10:33:09 +08:00 |
|
Guan Xiying
|
7ed0e3c970
|
* Add getDiffs function.
|
2021-08-25 10:32:44 +08:00 |
|
dingguodong
|
df116c8cdb
|
* Add view a MR(staging).
|
2021-08-24 23:22:35 +08:00 |
|
dingguodong
|
8b014e5869
|
Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR
|
2021-08-24 17:35:38 +08:00 |
|
dingguodong
|
8a6ef83c49
|
+ Add apiGetSingleBranch function.
|
2021-08-24 17:35:17 +08:00 |
|
lichengjun
|
67569ee658
|
* Add GitLab log.
|
2021-08-24 07:36:22 +00:00 |
|
dingguodong
|
4f94bcafc5
|
* Update function for editing a MR.
|
2021-08-24 11:13:00 +08:00 |
|
dingguodong
|
be9a94087c
|
* Change assignee and reviewer from gitlab user ID to zentao account.
|
2021-08-24 10:52:35 +08:00 |
|
dingguodong
|
18569c95d2
|
* Update apiSyncMR function.
|
2021-08-24 10:19:57 +08:00 |
|
lichengjun
|
2c0f36696d
|
* Adjust GitLab Token validation code.
|
2021-08-24 02:12:17 +00:00 |
|