From 55dc95d6015dfb980a118a3f2aec2c43c773e90a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 28 Apr 2014 15:03:45 -0400
Subject: [PATCH] Fix bug introduced in 67278f5

---
 releases.moxie |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index f683f2b..a08763e 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,10 +1,41 @@
 #
 # ${project.version} release
 #
-r22: {
+r23: {
     title: ${project.name} ${project.version} released
     id: ${project.version}
     date: ${project.buildDate}
+    note: ~
+    html: ~
+    text: ~
+    security: ~
+    fixes:
+    - Fix subdirectory links in pages servlet (issue-411)
+    - Fix subdirectory navigation in pages servlet (issue-412)
+    - Fix bug in adding invalid or empty SSH keys (ticket-50)
+    - Fix forcing default locale to en or LANG_CC for web ui (ticket-51)
+    changes:
+    - improve French translation (pr-176)
+    - simplify current plugin release detection and ignore the currentRelease registry field 
+    additions: ~
+    dependencyChanges:
+    - update to Apache MINA/SSHD 0.11.0 (issue-410)
+    contributors:
+    - James Moger
+    - Julien Kirch
+    - Ralph Hoffman
+    - Olivier Rouits
+    - Owen Nelson
+    - Alexander Zabluda
+}
+
+#
+# 1.5.0 release
+#
+r22: {
+    title: Gitblit 1.5.0 released
+    id: 1.5.0
+    date: 2014-04-17
     note: Gitblit now requires Java 7 for build & runtime.
     html: ~
     text: ''
@@ -21,8 +52,10 @@
     - Repository mailing lists could not be reset from the Edit Repository page (issue-399)
     - Fix intermittent NPE in determining commit date in RefModel (issue-401)
     - Fix closing ticket on push by parsing commit messages for closes|fixes (issue-404)
+    - Fix diffstat display for a ticket with a pending submodule change (issue-407)
     - Ensure the Lucene ticket index is updated on repository deletion.
     - Fixed failure to properly determine hasTicket in RedisTicketService
+    - Fixed handling of pushing ticket branch deletions
     changes:
     - Switch from GoogleCharts to self-hosted flotr2 charts (issue-283, ticket-43, pr-166)
     - Specify the --dailyLogFile option for the Ubuntu and CentOS service scripts (issue-348)
@@ -41,13 +74,15 @@
     - Added beginnings of a plugin framework for extending Gitblit (issue-381, ticket-23)
     - Added a French translation (pr-163)
     - Added a setting to control what transports may be used for pushes
+    - Expose JGit 3.x receive pack settings (issue-408)
     dependencyChanges:
     - Java 7
     - Jetty 9.1.4
     - args4j 2.0.26
     - JGit 3.3.1
     - Mina SSHD 0.10.1
-    - pf4j 0.7.1
+    - pf4j 0.8.0
+    - SLF4J 1.7.5
     contributors:
     - James Moger
     - David Ostrovsky
@@ -55,10 +90,16 @@
     - Jeremie Brebec
     - Tim Ryan
     - Decebal Suiu
+    - Eric Myrhe
+    - Kevin Walter
     settings:
     - { name: 'realm.ldap.bindpattern', defaultValue: ' ' }
     - { name: 'tickets.closeOnPushCommitMessageRegex', defaultValue: '(?:fixes|closes)[\\s-]+#?(\\d+)' }
     - { name: 'git.acceptedPushTransports', defaultValue: ' ' }
+    - { name: 'git.checkReceivedObjects', defaultValue: 'true' }
+    - { name: 'git.checkReferencedObjectsAreReachable', defaultValue: 'true' }
+    - { name: 'git.maxObjectSizeLimit', defaultValue: '0' }
+    - { name: 'git.maxPackSizeLimit', defaultValue: '-1' }
     - { name: 'git.sshPort', defaultValue: '29418' }
     - { name: 'git.sshBindInterface', defaultValue: ' ' }
     - { name: 'git.sshKeysManager', defaultValue: 'com.gitblit.transport.ssh.FileKeyManager' }
@@ -1261,6 +1302,6 @@
 	- James Moger
 }
 
-snapshot: &r22
-release: &r21
-releases: &r[1..21]
+snapshot: &r23
+release: &r22
+releases: &r[1..22]

--
Gitblit v1.9.1