* Fix bug #12296.

db/update15.0.rc3.sql

@@ -1,2 +1,6 @@
+<<<<<<< 8f71af3835517e1753ce10785378aceafe5f8f91
 ALTER TABLE `zt_webhook` CHANGE `projects` `executions` text NOT NULL;
 ALTER TABLE `zt_webhook` CHANGE `executions` `executions` text NOT NULL;
+=======
+ALTER TABLE `zt_repo` ADD `extra` char(30) COLLATE 'utf8_general_ci' NOT NULL AFTER `desc`;
+>>>>>>> * Fix bug #12296.

db/zentao.sql

@@ -751,6 +751,7 @@ CREATE TABLE IF NOT EXISTS `zt_repo` (
   `synced` tinyint(1) NOT NULL DEFAULT '0',
   `lastSync` datetime NOT NULL,
   `desc` text NOT NULL,
+  `extra` char(30) NOT NULL,
   `deleted` tinyint(1) NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;

module/repo/model.php

@@ -237,6 +237,7 @@ class repoModel extends model
         $data = fixer::input('post')
             ->setIf($this->post->SCM == 'Gitlab', 'password', $this->post->gitlabToken)
             ->setIf($this->post->SCM == 'Gitlab', 'client', $this->post->gitlabHost)
+            ->setIf($this->post->SCM == 'Gitlab', 'extra', $this->post->gitlabProject)
             ->skipSpecial('path,client,account,password')
             ->setDefault('product', '')
             ->join('product', ',')

module/repo/view/edit.html.php

@@ -48,7 +48,7 @@
           </tr>
           <tr class='gitlab hide'>
             <th><?php echo $lang->repo->gitlabProject;?></th>
-            <td><?php echo html::select('gitlabProject', $projects, '', "class='form-control chosen'");?>
+            <td><?php echo html::select('gitlabProject', $projects, $repo->extra, "class='form-control chosen'");?>
           </tr>
           <tr>
             <th><?php echo $lang->repo->name; ?></th>