Merge branch 'devops16'

module/repo/control.php

@@ -357,6 +357,7 @@ 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. */

module/repo/css/browse.css

@@ -1,4 +1,5 @@
 #mainMenu > .btn-toolbar {height: 35px; line-height: 35px;}
+#mainMenu > .pull-right {padding-right: 1%;}
 #sidebar>.sidebar-toggle>.icon {right: -2px; left: auto;}
 .main-row {width: 99%;}
 .btn-toolbar > .last-sync-time {display: inline-block; float: left; margin-right: 10px;}

module/repo/lang/en.php

@@ -146,6 +146,7 @@ $lang->repo->notice->syncedCount    = 'The number of records synchronized is ';
 $lang->repo->notice->delete         = 'Do you want to delete this repo?';
 $lang->repo->notice->successDelete  = 'Repository is removed.';
 $lang->repo->notice->commentContent = 'Comment';
+$lang->repo->notice->deleteReview   = 'Do you want to delete this review?';
 $lang->repo->notice->deleteBug      = 'Do you want to delete this bug?';
 $lang->repo->notice->deleteComment  = 'Do you want to delete this comment?';
 $lang->repo->notice->lastSyncTime   = 'Last Sync:';

module/repo/lang/zh-cn.php

@@ -146,6 +146,7 @@ $lang->repo->notice->syncedCount    = '已经同步记录条数';
 $lang->repo->notice->delete         = '是否要删除该版本库？';
 $lang->repo->notice->successDelete  = '已经成功删除版本库。';
 $lang->repo->notice->commentContent = '输入回复内容';
+$lang->repo->notice->deleteReview   = '确认删除该评审？';
 $lang->repo->notice->deleteBug      = '确认删除该Bug？';
 $lang->repo->notice->deleteComment  = '确认删除该回复？';
 $lang->repo->notice->lastSyncTime   = '最后更新于：';

module/repo/view/browse.html.php

@@ -59,6 +59,7 @@
   <div class="btn-toolbar pull-right">
     <span class='last-sync-time'><?php echo $lang->repo->notice->lastSyncTime . $cacheTime?></span>
     <?php echo html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($path) . "&revision=$revision&refresh=1"), "<i class='icon icon-refresh'></i> " . $lang->refresh, '', "class='btn btn-primary' data-app={$app->tab}");?>
+    <?php if($repo->SCM == 'Gitlab' and common::hasPriv('gitlab', 'createBranch')) echo html::a($this->createLink('gitlab', 'createBranch', "gitlabID={$repo->gitlab}&projectID={$repo->project}"), "<i class='icon icon-sm icon-plus'></i> " . $lang->gitlab->createBranch, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id="mainContent" class="main-row fade">

module/repo/view/maintain.html.php

@@ -55,9 +55,9 @@
             common::printIcon('repo', 'edit', "repoID=$repo->id&objectID=$objectID", '', 'list', 'edit');
             if(strtolower($repo->SCM) == "gitlab")
             {
+                common::printIcon('gitlab', 'manageProjectMembers', "repo={$repo->id}", '', 'list', 'team');
                 common::printIcon('gitlab', 'createWebhook', "repoID=$repo->id", '', 'list', 'change', 'hiddenwin');
                 common::printIcon('gitlab', 'importIssue', "repo={$repo->id}", '', 'list', 'link');
-                common::printIcon('gitlab', 'manageProjectMembers', "repo={$repo->id}", '', 'list', 'team');
             }
             common::printIcon('repo', 'delete', "repoID=$repo->id&objectID=$objectID", '', 'list', 'trash', 'hiddenwin');
             ?>