From c4a443e8bdd6f85265f4c460686bc44ddc8183e1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 09 May 2014 09:56:22 -0400
Subject: [PATCH] Merged #67 "Allow disabling repository deletion"

---
 releases.moxie |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 62a71c6..a5cfed9 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,10 +1,35 @@
 #
 # ${project.version} release
 #
-r23: {
+r24: {
     title: ${project.name} ${project.version} released
     id: ${project.version}
     date: ${project.buildDate}
+    note: ~
+    html: ~
+    text: ~
+    security: ~
+    fixes: ~
+    changes:
+    - Move repository deletion functions to the edit repository page AND allow deletion to be disabled (pr-180, ticket-67)
+    additions:
+    - Add FORK_REPOSITORY RPC request type (issue-371, pr-161, ticket-65)
+    - Add object type (ot) parameter for RSS queries to retrieve tag details (pr-165, ticket-66)
+    dependencyChanges: ~
+    contributors:
+    - Manisha Gayathri
+    - Gerard Smyth
+    settings:
+    - { name: 'web.allowDeletingNonEmptyRepositories', defaultValue: 'true' }
+}
+
+#
+# 1.5.1 release
+#
+r23: {
+    title: Gitblit 1.5.1 released
+    id: 1.5.1
+    date: 2014-05-07
     note: ~
     html: ~
     text: ~
@@ -16,6 +41,9 @@
     - 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)
+    - Ensure the repository model ref list is refreshed on ref creation or deletion (ticket-54)
+    - Fix case-sensitivity error in determining fork network (issue-420, ticket-62)
+    - 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
@@ -31,6 +59,8 @@
     - Olivier Rouits
     - Owen Nelson
     - Alexander Zabluda
+    - Philipp Beckmann
+    - Jakob Boysen
 }
 
 #
@@ -1306,6 +1336,6 @@
 	- James Moger
 }
 
-snapshot: &r23
-release: &r22
-releases: &r[1..22]
+snapshot: &r24
+release: &r23
+releases: &r[1..23]

--
Gitblit v1.9.1