diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 93ba842862..d30f55cafa 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -121,7 +121,6 @@ $lang->action->objectTypes['mr'] = 'Merge Request';
$lang->action->objectTypes['gitlabproject'] = 'GitLab Project';
$lang->action->objectTypes['gitlabuser'] = 'GitLab User';
$lang->action->objectTypes['gitlabgroup'] = 'GitLab Group';
-$lang->action->objectTypes['gitlabbranch'] = 'GitLab Branch';
/* Used to describe operation history. */
$lang->action->desc = new stdclass();
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 48f20af743..c43e723f00 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -121,7 +121,6 @@ $lang->action->objectTypes['mr'] = '合并请求';
$lang->action->objectTypes['gitlabproject'] = 'GitLab项目';
$lang->action->objectTypes['gitlabuser'] = 'GitLab用户';
$lang->action->objectTypes['gitlabgroup'] = 'GitLab群组';
-$lang->action->objectTypes['gitlabbranch'] = 'GitLab分支';
/* 用来描述操作历史记录。*/
$lang->action->desc = new stdclass();
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index b0a9a555e3..ce31de4f53 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -91,7 +91,6 @@ $lang->block->refresh = 'Refresh';
$lang->block->nbsp = ' ';
$lang->block->hidden = 'Hide';
$lang->block->dynamicInfo = "%s %s %s %s %s";
-$lang->block->noLinkDynamic = "%s %s %s %s %s";
$lang->block->cannotPlaceInLeft = 'Cannot place the block at left side.';
$lang->block->cannotPlaceInRight = 'Cannot place the block at right side.';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index e5d8deface..ac77206f01 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -91,7 +91,6 @@ $lang->block->refresh = '刷新';
$lang->block->nbsp = '';
$lang->block->hidden = '隐藏';
$lang->block->dynamicInfo = "%s %s %s %s %s";
-$lang->block->noLinkDynamic = "%s %s %s %s %s";
$lang->block->cannotPlaceInLeft = '此区块无法放置在左侧。';
$lang->block->cannotPlaceInRight = '此区块无法放置在右侧。';
diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php
index 215bb804d3..2447f62507 100644
--- a/module/block/view/dynamic.html.php
+++ b/module/block/view/dynamic.html.php
@@ -15,8 +15,7 @@
if($action->action == 'login' or $action->action == 'logout') $action->objectName = $action->objectLabel = '';
$class = $action->major ? "class='active'" : '';
echo "
";
- if($action->objectLink) printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName, $action->objectName);
- if(!$action->objectLink) printf($lang->block->noLinkDynamic, $action->date, $action->objectName, $user, $action->actionLabel, $action->objectLabel, $action->objectName);
+ printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName, $action->objectName);
echo "
";
$i++;
}
diff --git a/module/gitlab/config.php b/module/gitlab/config.php
index bd6760c7cc..5f41d70ceb 100644
--- a/module/gitlab/config.php
+++ b/module/gitlab/config.php
@@ -5,9 +5,6 @@ $config->gitlab->create->requiredFields = 'name,url,token';
$config->gitlab->edit = new stdclass;
$config->gitlab->edit->requiredFields = 'name,url,token';
-$config->gitlab->createbranch = new stdclass;
-$config->gitlab->createbranch->requiredFields = 'branch,ref';
-
$config->gitlab->labelPattern = new stdclass;
$config->gitlab->labelPattern->task = '/^zentao_task\/\d+$/';
$config->gitlab->labelPattern->bug = '/^zentao_bug\/\d+$/';
diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index b1738b51fd..e56cae595d 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -712,39 +712,6 @@ class gitlab extends control
die(js::alert($reponse->message));
}
- /**
- * Creat a gitlab branch.
- *
- * @param int $gitlabID
- * @param int $projectID
- * @access public
- * @return void
- */
- public function createBranch($gitlabID, $projectID)
- {
- if($_POST)
- {
- $this->gitlab->createBranch($gitlabID, $projectID);
- if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-
- $locate = $this->session->gitlabBranchList ? $this->session->gitlabBranchList : inlink('browseBranch', "gitlibID=$gitlabID&projectID=$projectID");
- return $this->send(array('result' => 'success', 'message' => $this->lang->gitlab->createSuccess, 'locate' => $locate));
- }
-
- /* Get branches by api. */
- $branches = $this->gitlab->apiGetBranches($gitlabID, $projectID);
- if(!is_array($branches)) $branches= array();
-
- $branchPairs = array();
- foreach($branches as $branch) $branchPairs[$branch->name] = $branch->name;
-
- $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->createBranch;
- $this->view->gitlabID = $gitlabID;
- $this->view->projectID = $projectID;
- $this->view->branchPairs = $branchPairs;
- $this->display();
- }
-
/**
* Import gitlab issue to zentaopms.
*
diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php
index 3224521a51..07c7ad4e7f 100644
--- a/module/gitlab/lang/en.php
+++ b/module/gitlab/lang/en.php
@@ -37,7 +37,6 @@ $lang->gitlab->manageProjectMembers = 'Manage project member';
$lang->gitlab->createProject = 'Create GitLab project';
$lang->gitlab->editProject = 'Eidt GitLab project';
$lang->gitlab->deleteProject = 'Delete GitLab project';
-$lang->gitlab->createBranch = 'Create Branch';
$lang->gitlab->createGroup = 'Create group';
$lang->gitlab->editGroup = 'Edit group';
$lang->gitlab->deleteGroup = 'Delete group';
@@ -54,12 +53,10 @@ $lang->gitlab->token = 'Token';
$lang->gitlab->defaultProject = 'Default Project';
$lang->gitlab->private = 'MD5 Verify';
-$lang->gitlab->lblCreate = 'Create GitLab Server';
-$lang->gitlab->desc = 'Description';
-$lang->gitlab->tokenFirst = 'When the Token is not empty, the Token will be used first';
-$lang->gitlab->tips = 'When using a password, please disable the "Prevent cross-site request forgery" option in the GitLab global security settings.';
-$lang->gitlab->emptyError = "cannot be empty";
-$lang->gitlab->createSuccess = "Create success";
+$lang->gitlab->lblCreate = 'Create GitLab Server';
+$lang->gitlab->desc = 'Description';
+$lang->gitlab->tokenFirst = 'When the Token is not empty, the Token will be used first';
+$lang->gitlab->tips = 'When using a password, please disable the "Prevent cross-site request forgery" option in the GitLab global security settings.';
$lang->gitlab->placeholder = new stdclass;
$lang->gitlab->placeholder->name = '';
@@ -85,13 +82,11 @@ $lang->gitlab->apiError[0] = 'internal is not allowed in a private group.';
$lang->gitlab->apiError[1] = 'public is not allowed in a private group.';
$lang->gitlab->apiError[2] = 'is too short (minimum is 8 characters)';
$lang->gitlab->apiError[3] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
-$lang->gitlab->apiError[4] = 'Branch already exists';
$lang->gitlab->errorLang[0] = 'You cannot set Internal as its Visibility Level, if it is private in GitLab.';
$lang->gitlab->errorLang[1] = 'You cannot set Public as its Visibility Level, if it is private in GitLab.';
$lang->gitlab->errorLang[2] = 'Password is too short (minimum is 8 characters)';
$lang->gitlab->errorLang[3] = 'It should contain only letters, digits, underscore, hyphen and period. It should not start with hypen, or end with .git or .atom.';
-$lang->gitlab->errorLang[4] = 'Branch already exists.';
$lang->gitlab->project = new stdclass;
$lang->gitlab->project->id = "Project ID";
@@ -176,8 +171,3 @@ $lang->gitlab->group->memberName = 'Account';
$lang->gitlab->group->memberAccessLevel = 'Access Level';
$lang->gitlab->group->memberExpiresAt = 'Expiration time';
$lang->gitlab->group->repeatError = "Group members cannot be added repeatedly";
-
-$lang->gitlab->branch = new stdclass();
-$lang->gitlab->branch->name = 'Branch Name';
-$lang->gitlab->branch->from = 'Create from';
-$lang->gitlab->branch->create = 'Create';
diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php
index d23f272d0d..d911572925 100644
--- a/module/gitlab/lang/zh-cn.php
+++ b/module/gitlab/lang/zh-cn.php
@@ -37,7 +37,6 @@ $lang->gitlab->manageProjectMembers = '项目成员管理';
$lang->gitlab->createProject = '添加GitLab项目';
$lang->gitlab->editProject = '编辑GitLab项目';
$lang->gitlab->deleteProject = '删除GitLab项目';
-$lang->gitlab->createBranch = '添加分支';
$lang->gitlab->createGroup = '添加群组';
$lang->gitlab->editGroup = '编辑群组';
$lang->gitlab->deleteGroup = '删除群组';
@@ -54,12 +53,10 @@ $lang->gitlab->token = 'Token';
$lang->gitlab->defaultProject = '默认项目';
$lang->gitlab->private = 'MD5验证';
-$lang->gitlab->lblCreate = '添加GitLab服务器';
-$lang->gitlab->desc = '描述';
-$lang->gitlab->tokenFirst = 'Token不为空时,优先使用Token。';
-$lang->gitlab->tips = '使用密码时,请在GitLab全局安全设置中禁用"防止跨站点请求伪造"选项。';
-$lang->gitlab->emptyError = "不能为空";
-$lang->gitlab->createSuccess = "创建成功";
+$lang->gitlab->lblCreate = '添加GitLab服务器';
+$lang->gitlab->desc = '描述';
+$lang->gitlab->tokenFirst = 'Token不为空时,优先使用Token。';
+$lang->gitlab->tips = '使用密码时,请在GitLab全局安全设置中禁用"防止跨站点请求伪造"选项。';
$lang->gitlab->placeholder = new stdclass;
$lang->gitlab->placeholder->name = '';
@@ -85,13 +82,11 @@ $lang->gitlab->apiError[0] = 'internal is not allowed in a private group.';
$lang->gitlab->apiError[1] = 'public is not allowed in a private group.';
$lang->gitlab->apiError[2] = 'is too short (minimum is 8 characters)';
$lang->gitlab->apiError[3] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
-$lang->gitlab->apiError[4] = 'Branch already exists';
$lang->gitlab->errorLang[0] = '私有分组的项目,可见性级别不能设为内部。';
$lang->gitlab->errorLang[1] = '私有分组的项目,可见性级别不能设为公开。';
$lang->gitlab->errorLang[2] = '密码太短(最少8个字符)';
$lang->gitlab->errorLang[3] = "只能包含字母、数字、'.'-'和'.'。不能以'-'开头、以'.git'结尾或以'.atom'结尾。";
-$lang->gitlab->errorLang[4] = '分支名已存在。';
$lang->gitlab->project = new stdclass;
$lang->gitlab->project->id = "项目ID";
@@ -176,8 +171,3 @@ $lang->gitlab->group->memberName = '账号';
$lang->gitlab->group->memberAccessLevel = '角色权限';
$lang->gitlab->group->memberExpiresAt = '过期时间';
$lang->gitlab->group->repeatError = "群组成员不能重复添加";
-
-$lang->gitlab->branch = new stdclass();
-$lang->gitlab->branch->name = '分支名';
-$lang->gitlab->branch->from = '创建自';
-$lang->gitlab->branch->create = '创建';
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 6ca9804d8d..437a2a05ce 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -896,24 +896,6 @@ class gitlabModel extends model
return json_decode(commonModel::http($url, array(), $options = array(CURLOPT_CUSTOMREQUEST => 'DELETE')));
}
- /**
- * Create a gitab user by api.
- *
- * @param int $gitlabID
- * @param int $projectID
- * @param object $branch
- * @access public
- * @return object
- */
- public function apiCreateBranch($gitlabID, $projectID, $branch)
- {
- if(empty($branch->branch) or empty($branch->ref)) return false;
-
- $apiRoot = $this->getApiRoot($gitlabID);
- $url = sprintf($apiRoot, "/projects/{$projectID}/repository/branches");
- return json_decode(commonModel::http($url, $branch));
- }
-
/**
* Get single project by API.
*
@@ -2254,33 +2236,6 @@ class gitlabModel extends model
return $this->apiErrorHandling($reponse);
}
- /**
- * Create a gitlab branch.
- *
- * @param int $gitlabID
- * @param int $projectID
- * @access public
- * @return bool
- */
- public function createBranch($gitlabID, $projectID)
- {
- $branch = fixer::input('post')->get();
-
- if(empty($branch->branch)) dao::$errors['branch'][] = $this->lang->gitlab->branch->name . $this->lang->gitlab->emptyError;
- if(empty($branch->ref)) dao::$errors['ref'][] = $this->lang->gitlab->branch->from . $this->lang->gitlab->emptyError;
- if(dao::isError()) return false;
-
- $reponse = $this->apiCreateBranch($gitlabID, $projectID, $branch);
-
- if(!empty($reponse->name))
- {
- $this->loadModel('action')->create('gitlabbranch', 0, 'created', '', $reponse->name);
- return true;
- }
-
- return $this->apiErrorHandling($reponse);
- }
-
/**
* Api error handling.
*
diff --git a/module/gitlab/view/createbranch.html.php b/module/gitlab/view/createbranch.html.php
deleted file mode 100644
index 391f3ff94c..0000000000
--- a/module/gitlab/view/createbranch.html.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- * @package gitlab
- * @version $Id$
- * @link https://www.zentao.net
- */
-?>
-
-
-
-
-
-
gitlab->createBranch;?>
-
-
-
-
-
-
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 552f0f9142..f4abbb41bb 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1245,7 +1245,6 @@ $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->webhook = 'webhook';
$lang->resource->gitlab->createWebhook = 'createWebhook';
$lang->resource->gitlab->manageProjectMembers = 'manageProjectMembers';
diff --git a/module/repo/control.php b/module/repo/control.php
index 78c3294bb2..2bc9dd1f34 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -357,7 +357,6 @@ class repo extends control
session_start();
$this->session->set('revisionList', $this->app->getURI(true));
- $this->session->set('gitlabBranchList', $this->app->getURI(true));
session_write_close();
/* Get repo and synchronous commit. */
diff --git a/module/repo/view/browse.html.php b/module/repo/view/browse.html.php
index cca1e145c7..5a5d289fe0 100644
--- a/module/repo/view/browse.html.php
+++ b/module/repo/view/browse.html.php
@@ -59,7 +59,6 @@
repo->notice->lastSyncTime . $cacheTime?>
repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($path) . "&revision=$revision&refresh=1"), " " . $lang->refresh, '', "class='btn btn-primary' data-app={$app->tab}");?>
- SCM == 'Gitlab' and common::hasPriv('gitlab', 'createBranch')) echo html::a($this->createLink('gitlab', 'createBranch', "gitlabID={$repo->gitlab}&projectID={$repo->project}"), " " . $lang->gitlab->createBranch, '', "class='btn btn-primary'");?>