From 3e79dcf7a40245e97838b12310836cccb6296b20 Mon Sep 17 00:00:00 2001
From: Andreas Jaggi <andreas.jaggi@waterwave.ch>
Date: Sun, 17 Jan 2016 13:18:03 +0100
Subject: [PATCH 1/5] Limit recent updated repositories list. #1011

---
 src/main/twirl/gitbucket/core/index.scala.html | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/index.scala.html b/src/main/twirl/gitbucket/core/index.scala.html
index f209fb519..035dde60b 100644
--- a/src/main/twirl/gitbucket/core/index.scala.html
+++ b/src/main/twirl/gitbucket/core/index.scala.html
@@ -48,7 +48,7 @@
                   }
                   @if(userRepositories.size > max){
                     <li class="list-group-item show-more">
-                      <a href="javascript:void(0);" id="show-more-repos">Show more @{userRepositories.size - max} pages...</a>
+                      <a href="javascript:void(0);" id="show-more-repos">Show @{userRepositories.size - max} more repositories...</a>
                     </li>
                   }
                 }
@@ -62,12 +62,19 @@
           @if(recentRepositories.isEmpty){
             <li class="list-group-item">No repositories</li>
           } else {
-              @recentRepositories.map { repository =>
-                <li class="list-group-item repo-link">
+            @defining(20){ max =>
+              @recentRepositories.zipWithIndex.map { case (repository, i) =>
+                <li class="list-group-item repo-link" style="@if(i > max - 1){display:none;}">
                   @helper.html.repositoryicon(repository, false)
                   <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
                 </li>
               }
+              @if(recentRepositories.size > max){
+                <li class="list-group-item show-more">
+                  <a href="javascript:void(0);" id="show-more-recent-repos">Show @{recentRepositories.size - max} more repositories...</a>
+                </li>
+              }
+            }
           }
           </ul>
         </div>
@@ -77,7 +84,7 @@
 }
 <script>
 $(function(){
-  $('#show-more-repos').click(function(e){
+  $('#show-more-repos, #show-more-recent-repos').click(function(e){
     $(e.target).parents('ul.list-group').find('li.repo-link').show();
     $(e.target).parents('li.show-more').remove();
   });

From 833cfc346526facd248f855a7ba3152693a0dd0a Mon Sep 17 00:00:00 2001
From: lidice <dev@lidice.org>
Date: Thu, 21 Jan 2016 23:22:10 +0900
Subject: [PATCH 2/5] (fixes #1062) Remove a wrong link

---
 src/main/twirl/gitbucket/core/issues/labels/list.scala.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/twirl/gitbucket/core/issues/labels/list.scala.html b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html
index 7331129c2..d06c5ecfd 100644
--- a/src/main/twirl/gitbucket/core/issues/labels/list.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html
@@ -28,7 +28,7 @@
             <td style="padding: 20px; background-color: #eee; text-align: center;">
               No labels to show.
               @if(hasWritePermission){
-                <a href="@url(repository)/issues/labels/new">Create a new label.</a>
+                Click on the "New Label" button above to create one.
               }
             </td>
           </tr>

From 501f542982ea269afad32424f8c73d60d09467d8 Mon Sep 17 00:00:00 2001
From: oohira <oohira.dev@gmail.com>
Date: Fri, 22 Jan 2016 23:31:29 +0900
Subject: [PATCH 3/5] Fix typo

---
 README.md                                              | 2 +-
 doc/auto_update.md                                     | 4 ++--
 doc/directory.md                                       | 6 +++---
 doc/release.md                                         | 2 +-
 src/main/scala/gitbucket/core/servlet/AutoUpdate.scala | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index d7dc176c2..42150b43d 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ Release Notes
 ### 3.10 - 30 Dec 2015
 - Move to Bootstrap3
 - New URL for raw contents (`raw/master/doc/activity.md` instead of `blob/master/doc/activity.md?raw=true`)
-- Update xsbt-web-pligin
+- Update xsbt-web-plugin
 - Update H2 database
 
 ### 3.9 - 5 Dec 2015
diff --git a/doc/auto_update.md b/doc/auto_update.md
index 220a88412..992672fea 100644
--- a/doc/auto_update.md
+++ b/doc/auto_update.md
@@ -8,7 +8,7 @@ To release a new version of GitBucket, add the version definition to the [gitbuc
 object AutoUpdate {
   ...
   /**
-   * The history of versions. A head of this sequence is the current BitBucket version.
+   * The history of versions. A head of this sequence is the current GitBucket version.
    */
   val versions = Seq(
       Version(1, 0)
@@ -20,7 +20,7 @@ Next, add a SQL file which updates database schema into [/src/main/resources/upd
 
 GitBucket stores the current version to ```GITBUCKET_HOME/version``` and checks it at start-up. If the stored version differs from the actual version, it executes differences of SQL files between the stored version and the actual version. And ```GITBUCKET_HOME/version``` is updated by the actual version.
 
-We can also add any Scala code for upgrade GitBucket which modifies ｒesources other than database. Override ```Version.update``` like below:
+We can also add any Scala code for upgrade GitBucket which modifies resources other than database. Override ```Version.update``` like below:
 
 ```scala
 val versions = Seq(
diff --git a/doc/directory.md b/doc/directory.md
index de73fe91f..b01669824 100644
--- a/doc/directory.md
+++ b/doc/directory.md
@@ -8,10 +8,10 @@ This directory has following structure:
 * /HOME/gitbucket
   * /repositories 
     * /USER_NAME
-      * / REPO_NAME.git (substance of repository. GitServlet sees this directory)
-      * / REPO_NAME
+      * /REPO_NAME.git (substance of repository. GitServlet sees this directory)
+      * /REPO_NAME
         * /issues (files which are attached to issue)
-      * / REPO_NAME.wiki.git (wiki repository)
+      * /REPO_NAME.wiki.git (wiki repository)
   * /data
     * /USER_NAME
       * /files
diff --git a/doc/release.md b/doc/release.md
index b515c801d..7c97c3955 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -23,7 +23,7 @@ object MyBuild extends Build {
 object AutoUpdate {
 
   /**
-   * The history of versions. A head of this sequence is the current BitBucket version.
+   * The history of versions. A head of this sequence is the current GitBucket version.
    */
   val versions = Seq(
     new Version(3, 3), // <---- add this line!!
diff --git a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
index 6a284ee3c..2d80bf798 100644
--- a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
+++ b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
@@ -18,7 +18,7 @@ import gitbucket.core.util.Directory
 object AutoUpdate {
 
   /**
-   * The history of versions. A head of this sequence is the current BitBucket version.
+   * The history of versions. A head of this sequence is the current GitBucket version.
    */
   val versions = Seq(
     new Version(3, 11),
@@ -156,7 +156,7 @@ object AutoUpdate {
   )
 
   /**
-   * The head version of BitBucket.
+   * The head version of GitBucket.
    */
   val headVersion = versions.head
 

From cdf0d06bccba6a8849bc7914f8f986dc4bc55d20 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sat, 23 Jan 2016 21:35:36 +0900
Subject: [PATCH 4/5] (refs #1051)Don't render README folder

---
 .../gitbucket/core/controller/RepositoryViewerController.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
index da9b2d9e1..4abf09ca7 100644
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -634,7 +634,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             val parentPath = if (path == ".") Nil else path.split("/").toList
             // process README.md or README.markdown
             val readme = files.find { file =>
-              readmeFiles.contains(file.name.toLowerCase)
+              !file.isDirectory && readmeFiles.contains(file.name.toLowerCase)
             }.map { file =>
               val path = (file.name :: parentPath.reverse).reverse
               path -> StringUtil.convertFromByteArray(JGitUtil.getContentFromId(

From 9b06bfaaf5d2c1248cee18c9b78f35224eae6dfb Mon Sep 17 00:00:00 2001
From: Andreas Jaggi <andreas.jaggi@waterwave.ch>
Date: Sat, 23 Jan 2016 18:40:49 +0100
Subject: [PATCH 5/5] Set Content-Type to json for /api/v3/* (fix #1056)

---
 src/main/scala/gitbucket/core/controller/ControllerBase.scala | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
index 63949ab7f..7d261b242 100644
--- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
@@ -30,6 +30,10 @@ abstract class ControllerBase extends ScalatraFilter
 
   implicit val jsonFormats = DefaultFormats
 
+  before("/api/v3/*") {
+    contentType = formats("json")
+  }
+
 // TODO Scala 2.11
 //  // Don't set content type via Accept header.
 //  override def format(implicit request: HttpServletRequest) = ""