From 75f83bac4aae5e9c467651fe6051a7aad102d40d Mon Sep 17 00:00:00 2001
From: holan20180123 <liyuchun@easycorp.ltd>
Date: Thu, 5 Aug 2021 13:33:29 +0800
Subject: [PATCH 1/2]  * Adjust style of jenkins and job browse.

---
 module/jenkins/view/browse.html.php | 2 +-
 module/job/view/browse.html.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/jenkins/view/browse.html.php b/module/jenkins/view/browse.html.php
index cddf5ca7ab..1a398f80ba 100644
--- a/module/jenkins/view/browse.html.php
+++ b/module/jenkins/view/browse.html.php
@@ -25,7 +25,7 @@
           <th class='w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->jenkins->id); ?></th>
           <th class='w-200px text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->jenkins->name); ?></th>
           <th class='text-left'><?php common::printOrderLink('url', $orderBy, $vars, $lang->jenkins->url); ?></th>
-          <th class='w-100px c-actions-4'><?php echo $lang->actions; ?></th>
+          <th class='c-actions-2'><?php echo $lang->actions; ?></th>
         </tr>
       </thead>
       <tbody>
diff --git a/module/job/view/browse.html.php b/module/job/view/browse.html.php
index 1377b630ea..2d99b02251 100644
--- a/module/job/view/browse.html.php
+++ b/module/job/view/browse.html.php
@@ -52,13 +52,13 @@
         <?php foreach($jobList as $id => $job):?>
         <tr class='text-left'>
           <td class='text-center'><?php echo $id;?></td>
-          <td class='text-left' title='<?php echo $job->name;?>'><?php echo common::hasPriv('job', 'view') ? html::a($this->createLink('job', 'view', "jobID={$job->id}", 'html', true), $job->name, '', "class='iframe' data-width='90%'") : $job->name;?></td>
+          <td class='text-left c-name' title='<?php echo $job->name;?>'><?php echo common::hasPriv('job', 'view') ? html::a($this->createLink('job', 'view', "jobID={$job->id}", 'html', true), $job->name, '', "class='iframe' data-width='90%'") : $job->name;?></td>
           <td title='<?php echo $job->repoName;?>'><?php echo $job->repoName;?></td>
           <td><?php echo zget($lang->job->engineList, $job->engine);?></td>
           <td><?php echo zget($lang->job->frameList, $job->frame);?></td>
           <?php if(strtolower($job->engine) == 'gitlab') $job->pipeline = $this->loadModel('gitlab')->getObjectNameForJob($job->server, $job->pipeline);?>
           <?php $jenkins = urldecode($job->pipeline) . '@' . $job->jenkinsName;?>
-          <td title='<?php echo $jenkins;?>'><?php echo $jenkins;?></td>
+          <td class='c-name' title='<?php echo $jenkins;?>'><?php echo $jenkins;?></td>
           <?php $triggerConfig = $this->job->getTriggerConfig($job);?>
           <td title='<?php echo $triggerConfig;?>'><?php echo $triggerConfig;?></td>
           <td class='text-center'><?php if($job->lastStatus) echo zget($lang->compile->statusList, $job->lastStatus);?></td>

From efb55c623dcdd88a65463e56b22511ed9cad7029 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 5 Aug 2021 13:55:08 +0800
Subject: [PATCH 2/2] * Finish task #40916.

---
 module/upgrade/control.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index f1d0f1bf7d..4135a97c49 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -582,6 +582,8 @@ class upgrade extends control
 
         if(empty($repos))
         {
+            $this->dao->delete()->from(TABLE_BLOCK)->exec();
+            $this->dao->delete()->from(TABLE_CONFIG)->where('`key`')->eq('blockInited')->exec();
             $this->loadModel('setting')->deleteItems('owner=system&module=common&section=global&key=upgradeStep');
             die(js::locate($this->createLink('upgrade', 'afterExec', "fromVersion=&processed=no")));
         }