From 4e84166db5c5538e3984d9d2d6bb1f9902e65ee0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 04 Nov 2014 17:38:17 -0500
Subject: [PATCH] Merged #217 "Exclude SSLv3 from Gitblit GO https protocols"

---
 releases.moxie |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 6523ceb..d98c2d4 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -7,15 +7,26 @@
     date: ${project.buildDate}
     note: ~
     html: ~
-    text: ~
+    text: ''
+          The new gitblit.properties file "includes" defaults.properties which is the original
+          gitblit.properties file. You may continue using your existing gitblit.properties file
+          as before, however, you might find future upgrades simpler by adopting the new "include"
+          design.
+          ''
     security: ~
-    fixes: ~
+    fixes:
+    - Fix exception when viewing a ticket with a patchset where the integration branch does not exist (issue-521, ticket-212)
+    - Fix exception when deleting a repository using the FileTicketService (issue-522, ticket-213)
+    - Do not inject team repository permissions as explicit user permissoins when editing a user (issue-462, ticket-214)
+    - Whitelist the target link attribute in the XSS filter (ticket-216)
     changes:
     - Replaced Dagger with Guice (ticket-80)
     - Use release name as root directory in Gitblit GO artifacts (ticket-109)
+    - Split gitblit.properties into gitblit.properties & defaults.properties (ticket-110)
     - Show team type in teams page (pr-217, ticket-168)
     additions:
     - Add GitHub Octicons (ticket-106)
+    - Support for chain-loading properties files (ticket-110) 
     - Add Priority & Severity fields for tickets (pr-220, ticket-157)
     - Add Maintenance ticket type (pr-223, ticket-206)    
     dependencyChanges:
@@ -30,6 +41,8 @@
     - Alex Lewis
     - Florian Zschocke
     - Paul Martin
+    - razzard
+    - Alexander Zabluda
 }
 
 #
@@ -38,7 +51,7 @@
 r26: {
     title: Gitblit 1.6.2 released
     id: 1.6.2
-    date: ${project.buildDate}
+    date: 2014-10-28
     note: ~
     html: ~
     text: ~
@@ -46,12 +59,14 @@
     fixes:
     - Fix French translation (pr-224, ticket-210)
     - Fix raw servlet trashing paths with spaces (ticket-211)
+    - Fix PluginManager not properly respecting --noverify (ticket-209)
     changes: ~
     additions: ~
     dependencyChanges: ~
     contributors:
     - Pierre Templier
     - Barry Roberts 
+    - Jan Å mucr
 }
 
 #

--
Gitblit v1.9.1