Commit Graph

322 Commits

Author SHA1 Message Date
dingguodong
b3947d30e5 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-19 18:23:58 +08:00
dingguodong
1dc911db56 + Add apiGetUpstream,apiGetForks, getUserIdRealnamePairs. 2021-08-19 18:14:53 +08:00
dingguodong
66c69c04c9 * Correct ajaxGetProjectBranches function. 2021-08-19 18:13:08 +08:00
Guan Xiying
5537f3500a * Remove extra line. 2021-08-19 16:32:40 +08:00
lichengjun
b14f5af220 * Add GitLab Token authority verification. 2021-08-19 08:28:59 +00:00
lichengjun
9b20bfdf19 * Adjust jihuMR zh. 2021-08-19 08:20:09 +00:00
dingguodong
1b14499cae * Revert checkToken function. 2021-08-19 15:08:52 +08:00
lichengjun
34391dbe4c * Adjust Gitlab list function. 2021-08-18 08:49:02 +00:00
dingguodong
14de596bc0 * Rename getObjectNameForJob to getProjectName. 2021-08-18 10:40:15 +08:00
lichengjun
82cedbde1c Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-17 11:16:44 +00:00
lichengjun
8ebe5b4cc9 * adjust the GitLab list function 2021-08-17 11:14:56 +00:00
dingguodong
5728c38e66 * Remove and correct useless statements. 2021-08-17 17:49:47 +08:00
dingguodong
3dc7a2111b + Get project branches. 2021-08-17 17:44:58 +08:00
lichengjun
92cac9b4c2 * Adjust the gitlab validation style. 2021-08-16 07:29:19 +00:00
holan20180123
34fca03d67 * Fix bug #13967. 2021-08-05 16:11:04 +08:00
holan20180123
d80633e29b * Add go back link in import issue. 2021-08-05 16:04:42 +08:00
holan20180123
f2bcfa15a5 * Adjust page style of gitlab browse. 2021-08-05 10:52:27 +08:00
holan20180123
824f0b28cf * Adjust gitlab browse style. 2021-08-05 10:40:11 +08:00
dingguodong
67a3e24155 * Set menu when changing tab(menu) from gitlab to repo. 2021-08-04 15:22:05 +08:00
wangyidong
392f0b1525 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-04 14:19:37 +08:00
wangyidong
fd8d02c7df * add new version and upgrade. 2021-08-04 14:18:09 +08:00
dingguodong
86702f6c7c * Fix bug for description is empty when importing a issue. 2021-08-04 13:54:29 +08:00
dingguodong
a18fdc5a54 - Remove extra line for importing issues. 2021-08-03 15:47:34 +08:00
dingguodong
dbdea2e48c * Add lang for gitlab module and adjust codes after code review. 2021-08-03 15:21:01 +08:00
Guan Xiying
800ff00032 * Fix exec gitlab pipeline function. 2021-07-29 17:28:51 +08:00
Guan Xiying
f053df8912 * Rename jobModel::getGitlabProjectName to gitlabModel::getObjectNameForJob. 2021-07-29 15:51:11 +08:00
dingguodong
2dc9795bae * Update create pipeline function. 2021-07-29 15:12:41 +08:00
dingguodong
3312ae8bfd + Get project repository branches and tags by api. 2021-07-28 17:30:57 +08:00
dingguodong
5c7709d784 * Change gitlab api for getting job log. 2021-07-27 20:03:21 +08:00
dingguodong
22e7de0524 * Display gitlab pipeline log and add refresh button. 2021-07-27 17:26:45 +08:00
dingguodong
4604f26da9 * Put functions from gitlabpipeline into gitlab. 2021-07-26 16:19:21 +08:00
dingguodong
1cb5122e74 + Add apiGetSingleProject func. 2021-07-26 09:31:59 +08:00
dingguodong
21c9ee13bc + Add ajaxc getting gitlab project pipeline. 2021-07-22 09:27:24 +08:00
wangyidong
54ff43eb6f * add changelog and zh-tw lang. 2021-07-20 09:58:58 +08:00
lichengjun
3326a59cbd *Fix Bug ID 13665. 2021-07-16 09:46:01 +08:00
zhujinyong
6f04aedcd3 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 09:44:23 +08:00
zhujinyong
1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
lichengjun
ee5392f676 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-15 16:48:46 +08:00
lichengjun
53c075cbee *Adjust code. 2021-07-15 16:39:58 +08:00
hufangzhou
d9f5c53e0b * Adjust the code. 2021-07-15 15:54:08 +08:00
hufangzhou
f2fdd0b433 * Adjust the code. 2021-07-15 15:23:50 +08:00
hufangzhou
be50281d7a * Adjust the code. 2021-07-15 15:19:59 +08:00
dingguodong
cc51c80047 * Correct bad comments. 2021-07-15 15:18:01 +08:00
dingguodong
ef1b0dbb90 * Correct link in gitlab view. 2021-07-15 09:52:05 +08:00
dingguodong
0de91bbaf5 * Correct gitlab display error. 2021-07-15 09:40:51 +08:00
lichengjun
5d46c91a6b *Fix bug 13651. 2021-07-15 09:34:33 +08:00
lichengjun
a9862dc312 * Fix Bug 13654 and 13651. 2021-07-14 21:21:36 +08:00
lichengjun
49844b90e6 *Fix code format. 2021-07-14 15:05:27 +08:00
lichengjun
28d9d2993a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-14 15:01:39 +08:00
dingguodong
fd001068bb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-14 15:01:21 +08:00