From 671b5a456c48028d21855fe05c1fbc9013a180b7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 08 Sep 2014 15:26:22 -0400
Subject: [PATCH] Merge branch 'ticket/170' into develop

---
 releases.moxie |   63 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index c473d4f..e99cbd5 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,10 +1,49 @@
 #
 # ${project.version} release
 #
-r24: {
+r25: {
     title: ${project.name} ${project.version} released
     id: ${project.version}
     date: ${project.buildDate}
+    note: ~
+    html: ~
+    text: ~
+    security: ~
+    fixes:
+    - Fixed NPE when there are two repositories which only differ in case (pr-204, ticket-108)
+    - Fixed api/manager download links in documentation (issue-449, ticket-111)
+    - Fixed stackoverflow on (de)serialization of the history page (ticket-114)
+    - Fixed queries for milestones with hyphentated names (ticket-115)
+    - Fixed duplicate repositories on the dashboard (issue-454, ticket-117)
+    - Fixed lower-case project selection (ticket-118)
+    changes:
+    - Update Korean translation (pr-206, ticket-120)
+    - Improve web.canonicalUrl documentation (pr-205, ticket-121, issue-453)
+    additions: ~
+    dependencyChanges:
+    - Jetty 9.2.1 (pr-202)
+    - Lucene 4.8.1 (pr-201)
+    - JGit 3.4.0 (pr-200)
+    - Guice 4.0-beta4 (ticket-80)
+    - SLF4j 1.7.7 (ticket-122)
+    - gson 2.2.2 (ticket-123)
+    - Freemarker 2.3.20 (ticket-124)
+    contributors:
+    - James Moger
+    - David Ostrovsky
+    - Kyle Gottfried
+    - Yena Hong
+    - Eric Fairon
+    - Gareth Collins
+}
+
+#
+# 1.6.0 release
+#
+r24: {
+    title: Gitblit 1.6.0 released
+    id: 1.6.0
+    date: 2014-06-16
     note: ''
           The next major release (v1.7.0) will focus on:
           * ticket-75: making projects more useful including the concept of project ownership
@@ -23,6 +62,8 @@
           * Basic CRUD pages for ticket milestones
           * Overhaul repository creation, editing, and empty repository pages
           
+          If you are upgrading, you might consider copying the data/gitignore folder to your ${baseFolder} to allow selection & injection of a .gitignore when creating a repository.
+          
           The OpenShift Express build has been dropped. You can deploy GO or WAR on Express so this build is no longer necessary.
           ''
     security: ~
@@ -38,6 +79,7 @@
     - Fixed Ticket responsible selections not considering the AUTHENTICATED authorization control (ticket-91)
     - Fixed invalid generated SSH url for port 22 (issue-444, ticket-98)
     - Fix cloning repositories with `+` in their names. (revert pr-136, issue-362, ticket-100)
+    - Fixed NPE in GitblitClient (ticket-102)
     changes:
     - Split the pages servlet into a raw servlet and a pages servlet. All raw links now use the raw servlet (issue-413, ticket-49)
     - Drop deprecated --set-upstream syntax for -u (ticket-59)
@@ -45,6 +87,7 @@
     - BARNUM: Create ticket/N instead of topic/N for pt start N (ticket-61)
     - Move repository deletion functions to the edit repository page AND allow deletion to be disabled (pr-180, ticket-67)
     - Update the Korean translation (pr-184, ticket-69)
+    - Update the Dutch translation (pr-191)
     - Overhaul the EmptyRepositoryPage (ticket-73)
     - Overhauled the edit repository page (ticket-76)
     - Process bugtraq links in the ticket description and comments (ticket-78)
@@ -64,6 +107,9 @@
     - Tag server-side merges when incremental push tags are enabled (issue-432, ticket-85)
     - Add a user preference for the clone transport (ticket-90)
     - Add setting to control default thread pool size for miscellaneous background tasks (ticket-92)
+    - Add Norwegian transation (pr-186)
+    - Add German translation (pr-192)
+    - Add Italian translation (pr-196)
     dependencyChanges:
     - Update to javax.mail 1.5.1 (issue-417, ticket-58)
     contributors:
@@ -77,6 +123,15 @@
     - Matthias Cullmann
     - Emmeran Seehuber
     - Sascha Vogt
+    - Carsten Lenz
+    - Matthias Sohn
+    - Leif Jantzen
+    - Stardrad Yin
+    - Jeroen Baten
+    - Dongsu Kim
+    - Karanbir Singh
+    - Tamás Papp
+    - GianMaria Romanato
     settings:
     - { name: 'web.allowDeletingNonEmptyRepositories', defaultValue: 'true' }
     - { name: 'web.includePersonalRepositories', defaultValue: 'false' }
@@ -1398,6 +1453,6 @@
 	- James Moger
 }
 
-snapshot: &r24
-release: &r23
-releases: &r[1..23]
+snapshot: ~
+release: &r24
+releases: &r[1..24]

--
Gitblit v1.9.1