From ab07d0d86d8b64b4f7c88b45bc81f1eec22105db Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:00:05 -0400
Subject: [PATCH] Preserve key index when re-adding an existing key

---
 releases.moxie |   82 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 462a3b9..7f91061 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,7 +1,7 @@
 #
 # ${project.version} release
 #
-r21: {
+r22: {
     title: ${project.name} ${project.version} released
     id: ${project.version}
     date: ${project.buildDate}
@@ -10,11 +10,83 @@
     text: ~
     security: ~
     fixes:
+    - Repository mailing lists could not be reset from the Edit Repository page (issue-399)
+    - Fix intermittent NPE in determining commit date in RefModel (issue-401)
+    - Fix closing ticket on push by parsing commit messages for closes|fixes (issue-404)
+    - Ensure the Lucene ticket index is updated on repository deletion.
+    - Fixed failure to properly determine hasTicket in RedisTicketService
+    changes:
+    - Switch from GoogleCharts to self-hosted flotr2 charts (issue-283, ticket-43, pr-166)
+    - Specify the --dailyLogFile option for the Ubuntu and CentOS service scripts (issue-348)
+    - Improve logging for missing LDAP uid attribute when synchronizing (issue-394)
+    - The ticket close-on-push commit message regular expression is now configurable by a setting (issue-404)
+    - Redirect to summary page on edit repository (issue-405)
+    - Option to allow LDAP users to directly authenticate without performing LDAP searches (pr-162)
+    - Replace JCommander with args4j to be consistent with other tools (ticket-28)
+    additions:
+    - Added an SSH daemon with public key authentication (issue-369, ticket-6)
+    - Added beginnings of a plugin framework for extending Gitblit (issue-381, ticket-23)
+    - Added a French translation (pr-163)
+    dependencyChanges:
+    - args4j 2.0.26
+    - JGit 3.3.1
+    contributors:
+    - James Moger
+    - David Ostrovsky
+    - Johann Ollivier-Lapeyre
+    - Jeremie Brebec
+    - Tim Ryan
+    settings:
+    - { name: 'realm.ldap.bindpattern', defaultValue: ' ' }
+    - { name: 'tickets.closeOnPushCommitMessageRegex', defaultValue: '(?:fixes|closes)[\\s-]+#?(\\d+)' }
+    - { name: 'git.sshPort', defaultValue: '29418' }
+    - { name: 'git.sshBindInterface', defaultValue: ' ' }
+    - { name: 'git.sshKeysManager', defaultValue: 'com.gitblit.transport.ssh.FileKeyManager' }
+    - { name: 'git.sshKeysFolder', defaultValue: '${baseFolder}/ssh' }
+    - { name: 'git.sshBackend', defaultValue: 'NIO2' }
+    - { name: 'git.sshCommandStartThreads', defaultValue: '2' }
+    - { name: 'plugins.folder', defaultValue: '${baseFolder}/plugins' }
+}
+
+#
+# 1.4.1 release
+#
+r21: {
+    title: Gitblit 1.4.1 released
+    id: 1.4.1
+    date: 2014-03-18
+    note: "The default access restriction has been elevated from NONE to PUSH and anonymous push access has been disabled by default."
+    html: ~
+    text: ''
+          !! IMPORTANT BUG FIX FOR EXTERNAL AUTHENTICATION (1.4.1) !!
+          
+          This is a MAJOR release (1.4.0).
+          
+          The entire core has been refactored to be more modular.  Authentication providers have all been refactored to be simpler.  Both of these were precursor requirements for landing the Tickets feature -- issue tracker & branch-based pull requests.
+          
+          Markup rendering has been improved and expanded to several additional formats.  A repository mirroring service  has been added to allow you to automatically track public repositories.  Commit pages now indicate diffstat information and many bug fixes and smaller features have been introduced.
+          
+          The groundwork has also been laid for SSH support which will be in the focal point for the next major release (ticket-6).
+          
+          Due to the enormity of these changes, please make a backup copy of users.conf before updating.''
+    security:
+    - Fix major authentication security hole when using external authentication providers (issue-387, ticket-35)
+    fixes:
+    - Fixed incorrect branch ref in Ticket page for symlinks (issue-383, ticket-32)
+    - Fix NPE in FileTicketService (issue-386, ticket-34)
+    - Watch list push parameters were now always honored (ticket-30)
+    - Watch list push parameters were not always validated (ticket-29)
+    - Truncated tag messages in the tag panel did not have proper tooltips (ticket-31)
+    - Fix merging GO runtime settings with command-line override settings (ticket-33)
+    - Fix ticket page IOBE on Ticket page when Gitblit is not serving repositories (ticket-27)
+    - Exclude ticket branches when forking a repository (ticket-26)
+    - Workaround pegdown bug and improve relative image path processing (ticket-24)
     - Disable Ticket review functions in read-only repositories (mirror, frozen, etc)
     - Fix incorrect git fetch instructions in Ticket email notifications
     - Fix Ticket email notification recipients to include repository owners
     - Fix Ticket propose instructions to branch from origin/{integrationBranch}
-    changes: ~
+    changes:
+    - Add closed status for milestones and abandoned status for tickets (ticket-25)
     additions: ~
     dependencyChanges: ~
     contributors:
@@ -1168,6 +1240,6 @@
 	- James Moger
 }
 
-snapshot: &r21
-release: &r20
-releases: &r[1..20]
+snapshot: &r22
+release: &r21
+releases: &r[1..21]

--
Gitblit v1.9.1