From feefe7a2febab2e9fecc44b170ae900215816f7c Mon Sep 17 00:00:00 2001
From: Tom <tw201207@gmail.com>
Date: Fri, 14 Nov 2014 19:09:47 -0500
Subject: [PATCH] Minor corrections in Javascript

---
 releases.moxie |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 6523ceb..cc32d81 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -7,29 +7,43 @@
     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:
-    - Guice 4.0-beta4 (ticket-80)
+    - Guice 4.0-beta5 (ticket-80, ticket-219)
     - SLF4j 1.7.7 (ticket-122)
     - gson 2.2.2 (ticket-123)
     - Freemarker 2.3.20 (ticket-124)
     - Lucene 4.10.0 (ticket-159)
+    - SSHD 0.13.0 (ticket-218)
     contributors:
     - James Moger
     - David Ostrovsky
     - Alex Lewis
     - Florian Zschocke
     - Paul Martin
+    - razzard
+    - Alexander Zabluda
 }
 
 #
@@ -38,7 +52,7 @@
 r26: {
     title: Gitblit 1.6.2 released
     id: 1.6.2
-    date: ${project.buildDate}
+    date: 2014-10-28
     note: ~
     html: ~
     text: ~
@@ -46,12 +60,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