From 337e2a0406d56b0b05012eb8e3bc1a393502f714 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 07 May 2014 09:28:20 -0400
Subject: [PATCH] Merge branch 'ticket/63' into develop

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

diff --git a/releases.moxie b/releases.moxie
index 151f9c3..c750cba 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,10 +1,48 @@
 #
 # ${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)
+    - Fix inconsistency with repository ownership permission checking (ticket-52)
+    - Prevent submission from New|Edit ticket page with empty titles (ticket-53)
+    - Fix transport determination for SSH urls served on port 22 (issue-421, ticket-63)
+    changes:
+    - improve French translation (pr-176)
+    - simplify current plugin release detection and ignore the currentRelease registry field
+    - split pages servlet into two servlets (issue-413)
+    additions: ~
+    dependencyChanges:
+    - update to Apache MINA/SSHD 0.11.0 (issue-410)
+    - added Apache Tiki 1.5 (issue-413)
+    contributors:
+    - James Moger
+    - Julien Kirch
+    - Ralph Hoffman
+    - Olivier Rouits
+    - Owen Nelson
+    - Alexander Zabluda
+    - Philipp Beckmann
+    - Jakob Boysen
+}
+
+#
+# 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: ''
@@ -43,13 +81,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
@@ -57,10 +97,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' }
@@ -1263,6 +1309,6 @@
 	- James Moger
 }
 
-snapshot: &r22
-release: &r21
-releases: &r[1..21]
+snapshot: &r23
+release: &r22
+releases: &r[1..22]

--
Gitblit v1.9.1