Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'devops16'

Browse Source
This commit is contained in:
liyuchun
2021-12-13 12:12:37 +08:00
parent 58fb407b19 edfb34b749
commit 4ecc85aa0e
77 changed files with 2286 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/resource.php
+13 -5
View File
@@ -1245,9 +1245,15 @@ $lang->resource->gitlab->browseUser = 'browseUser';
$lang->resource->gitlab->createUser = 'createUser';
$lang->resource->gitlab->editUser = 'editUser';
$lang->resource->gitlab->deleteUser = 'deleteUser';
$lang->resource->gitlab->createBranch = 'createBranch';
$lang->resource->gitlab->browseBranch = 'browseBranch';
$lang->resource->gitlab->webhook = 'webhook';
$lang->resource->gitlab->createWebhook = 'createWebhook';
$lang->resource->gitlab->manageProjectMembers = 'manageProjectMembers';
$lang->resource->gitlab->browseBranchPriv = 'browseBranchPriv';
$lang->resource->gitlab->createBranchPriv = 'createBranchPriv';
$lang->resource->gitlab->editBranchPriv = 'editBranchPriv';
$lang->resource->gitlab->deleteBranchPriv = 'deleteBranchPriv';
$lang->gitlab->methodOrder[5] = 'browse';
$lang->gitlab->methodOrder[10] = 'create';
@@ -1269,9 +1275,11 @@ $lang->gitlab->methodOrder[90] = 'browseUser';
$lang->gitlab->methodOrder[95] = 'createUser';
$lang->gitlab->methodOrder[100] = 'editUser';
$lang->gitlab->methodOrder[105] = 'deleteUser';
$lang->gitlab->methodOrder[110] = 'webhook';
$lang->gitlab->methodOrder[115] = 'createWebhook';
$lang->gitlab->methodOrder[120] = 'manageProjectMembers';
$lang->gitlab->methodOrder[110] = 'createBranch';
$lang->gitlab->methodOrder[115] = 'browseBranch';
$lang->gitlab->methodOrder[120] = 'webhook';
$lang->gitlab->methodOrder[125] = 'createWebhook';
$lang->gitlab->methodOrder[130] = 'manageProjectMembers';
/* merge request. */
$lang->resource->mr = new stdclass();
@@ -1290,7 +1298,7 @@ $lang->resource->mr->unlink = 'unlink';
$lang->resource->mr->approval = 'approval';
$lang->resource->mr->close = 'close';
$lang->resource->mr->reopen = 'reopen';
$lang->resource->mr->addBug = 'addBug';
$lang->resource->mr->addReview = 'addReview';
$lang->mr->methodOrder[10] = 'create';
$lang->mr->methodOrder[15] = 'browse';
@@ -1307,7 +1315,7 @@ $lang->mr->methodOrder[75] = 'unlink';
$lang->mr->methodOrder[80] = 'approval';
$lang->mr->methodOrder[85] = 'close';
$lang->mr->methodOrder[90] = 'reopen';
$lang->mr->methodOrder[95] = 'addBug';
$lang->mr->methodOrder[95] = 'addReview';
/* Git. */
$lang->resource->git = new stdclass();