Update README.md

README.md

@@ -64,6 +64,12 @@ Support
 
 Release Notes
 -------------
+### 4.2.1 - 3 Jul 2016
+
+- Fix migration bug
+
+This bug is relevant to users who updated to 4.0 from 3.14. If your GitBucket had been updated from 3.14 to 4.0 or 4.1 then you must use this version instead of 4.2.
+
 ### 4.2 - 2 Jul 2016
 
 - New UI based on [AdminLTE](https://github.com/almasaeed2010/AdminLTE)

build.sbt

@@ -1,6 +1,6 @@
 val Organization = "gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.2.0"
+val GitBucketVersion = "4.2.1"
 val ScalatraVersion = "2.4.1"
 val JettyVersion = "9.3.9.v20160517"
 

src/main/scala/gitbucket/core/GitBucketCoreModule.scala

@@ -11,5 +11,6 @@ object GitBucketCoreModule extends Module("gitbucket-core",
   new Version("4.1.0"),
   new Version("4.2.0",
     new LiquibaseMigration("update/gitbucket-core_4.2.xml")
-  )
+  ),
+  new Version("4.2.1")
 )

src/main/scala/gitbucket/core/servlet/InitializeListener.scala

@@ -35,6 +35,7 @@ class InitializeListener extends ServletContextListener with SystemSettingsServi
 
     Database() withTransaction { session =>
       val conn = session.conn
+      val manager = new JDBCVersionManager(conn)
 
       // Check version
       val versionFile = new File(GitBucketHome, "version")
@@ -56,9 +57,8 @@ class InitializeListener extends ServletContextListener with SystemSettingsServi
           }
 
           // Change form
-          val manager = new JDBCVersionManager(conn)
           manager.initialize()
-          manager.updateVersion(GitBucketCoreModule.getModuleId, "4.0")
+          manager.updateVersion(GitBucketCoreModule.getModuleId, "4.0.0")
           conn.select("SELECT PLUGIN_ID, VERSION FROM PLUGIN"){ rs =>
             manager.updateVersion(rs.getString("PLUGIN_ID"), rs.getString("VERSION"))
           }
@@ -72,6 +72,13 @@ class InitializeListener extends ServletContextListener with SystemSettingsServi
         }
       }
 
+      // Rescue code for users who updated from 3.14 to 4.0.0
+      // https://github.com/gitbucket/gitbucket/issues/1227
+      val currentVersion = manager.getCurrentVersion(GitBucketCoreModule.getModuleId)
+      if(currentVersion == "4.0"){
+        manager.updateVersion(GitBucketCoreModule.getModuleId, "4.0.0")
+      }
+
       // Run normal migration
       logger.info("Start schema update")
       val solidbase = new Solidbase()

src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html

@@ -6,7 +6,10 @@
   <div class="sidebar">
   <ul class="nav sidebar-menu">
   @if(loginAccount.isDefined){
-    <li class="header">Your repositories <span class="label label-primary pull-right">@userRepositories.size</span></li>
+    <li class="header">
+      <span class="label label-primary pull-right">@userRepositories.size</span>
+      Your repositories
+    </li>
     @if(userRepositories.isEmpty){
       <li>No repositories</li>
     } else {

src/main/twirl/gitbucket/core/menu.scala.html

@@ -10,11 +10,11 @@
   <li @if(active == name){class="active"}>
     @if(path.startsWith("http")){
       <a href="@path" target="_blank">
-        <i class="menu-icon octicon octicon-@icon"></i> <span class="pc">@label @if(count > 0) { <span class="label label-primary pull-right">@count</span> }</span>
+        <i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right">@count</span> }
       </a>
     } else {
       <a href="@url(repository)@path">
-        <i class="menu-icon octicon octicon-@icon"></i> <span class="pc">@label @if(count > 0) { <span class="label label-primary pull-right">@count</span> }</span>
+        <i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right">@count</span> }
       </a>
     }
   </li>