Merge branch 'devops17' into 'devops17_wangyidong_46002'

# Conflicts:
#   db/update16.0.beta1.sql

db/update16.0.beta1.sql

@@ -8,8 +8,10 @@ ALTER TABLE `zt_bug` ADD `mr` mediumint(8) unsigned NOT NULL AFTER `repo`;
 
 UPDATE `zt_grouppriv` SET `method`='addReview' where `module`='mr' and `method`='addBug';
 
+
 ALTER TABLE `zt_repo` ADD `preMerge` enum('0','1') COLLATE 'utf8_general_ci' NOT NULL DEFAULT '0' AFTER `extra`;
 ALTER TABLE `zt_repo` ADD `job` mediumint unsigned NOT NULL AFTER `preMerge`;
 ALTER TABLE `zt_job` ADD `buildDir` text COLLATE 'utf8_general_ci' NULL AFTER `lastTag`;
 ALTER TABLE `zt_mr` ADD `synced` enum('0','1') COLLATE 'utf8_general_ci' NOT NULL DEFAULT '1';
 ALTER TABLE `zt_mr` ADD `diffs` longtext COLLATE 'utf8_general_ci' NULL AFTER `synced`;
+ALTER TABLE `zt_mr` ADD `removeSourceBranch` ENUM('0','1') NOT NULL DEFAULT '0' AFTER `compileStatus`;

db/zentao.sql

@@ -747,6 +747,7 @@ CREATE TABLE IF NOT EXISTS `zt_mr` (
   `jobID` mediumint(8) unsigned NOT NULL,
   `compileID` mediumint(8) unsigned NOT NULL,
   `compileStatus` char(30) NOT NULL,
+  `removeSourceBranch` enum('0','1') NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_mrapproval`;