From: James Moger <james.moger@gitblit.com>
Date: Sun, 26 Oct 2014 14:20:43 +0000 (-0400)
Subject: Merge branch 'ticket/211' into develop
X-Git-Tag: v1.7.0~1^2~120
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3faf6f6469759538590aa7f1012c543f95583c56;p=gitblit.git

Merge branch 'ticket/211' into develop
---

3faf6f6469759538590aa7f1012c543f95583c56
diff --cc releases.moxie
index 94427b10,446d1619..6523cebc
--- a/releases.moxie
+++ b/releases.moxie
@@@ -1,7 -1,7 +1,7 @@@
  #
  # ${project.version} release
  #
--r26: {
++r27: {
      title: ${project.name} ${project.version} released
      id: ${project.version}
      date: ${project.buildDate}
@@@ -9,29 -9,17 +9,51 @@@
      html: ~
      text: ~
      security: ~
 +    fixes: ~
 +    changes:
 +    - Replaced Dagger with Guice (ticket-80)
 +    - Use release name as root directory in Gitblit GO artifacts (ticket-109)
 +    - Show team type in teams page (pr-217, ticket-168)
 +    additions:
 +    - Add GitHub Octicons (ticket-106)
 +    - 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)
 +    - SLF4j 1.7.7 (ticket-122)
 +    - gson 2.2.2 (ticket-123)
 +    - Freemarker 2.3.20 (ticket-124)
 +    - Lucene 4.10.0 (ticket-159)
 +    contributors:
 +    - James Moger
 +    - David Ostrovsky
 +    - Alex Lewis
 +    - Florian Zschocke
 +    - Paul Martin
 +}
 +
++#
++# 1.6.2 release
++#
++r26: {
++    title: Gitblit 1.6.2 released
++    id: 1.6.2
++    date: ${project.buildDate}
++    note: ~
++    html: ~
++    text: ~
++    security: ~
+     fixes:
+     - Fix French translation (pr-224, ticket-210)
+     - Fix raw servlet trashing paths with spaces (ticket-211)
+     changes: ~
+     additions: ~
+     dependencyChanges: ~
+     contributors:
+     - Pierre Templier
+     - Barry Roberts 
+ }
+ 
  #
  # 1.6.1 release
  #
@@@ -1566,6 -1554,6 +1588,6 @@@ r1: 
  	- James Moger
  }
  
--snapshot: &r26
--release: &r25
--releases: &r[1..25]
++snapshot: &r27
++release: &r26
++releases: &r[1..26]