From 89e54f3254c396fc924fe7ad81fd48ce25aecd6d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 13 Jul 2013 11:05:02 -0400
Subject: [PATCH] Fixed possible NPE in forks page if user account no longer exists

---
 releases.moxie |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 3fbc03c..3772ed4 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -5,12 +5,16 @@
     title: Gitblit ${project.version} Released
     id: ${project.version}
     date: ${project.buildDate}
+    note: ''
+          If you have forked repositories and your are upgrading to ${project.version}, please DO NOT RELOCATE your repositories folder when running ${project.version} the first time.  Gitblit will update forked repository configs on the first execution and it is critical that ${git.repositoriesFolder} points to the same location used by 1.2.x.
+          ''
 	security:
 	- Raw servlet was insecure. If someone knew the exact repository name and path to a file, the raw blob could be retrieved bypassing security constraints. (issue 198)
     fixes:
 	 - Use bash instead of sh in Linux/OSX shell scripts (issue 154)
 	 - Fix NPE when getting user's fork without repository list caching (issue 182)
 	 - Fix internal error on folder history links (issue 192)
+	 - Fix NPE in repositories panel when viewing a federation proposal (issue 195)
 	 - Fix NPEs when initializing the context on a servlet containers which returns a null contextFolder (issue 199)
 	 - Fixed incorrect icon file name for .doc files (issue 200)
 	 - Do not queue emails with no recipients (issue 201)
@@ -26,6 +30,7 @@
 	 - Improve NPE handling for hook script enumeration (issue-253)
 	 - Workaround missing commit information in blame page (JGit bug 374382, issue-254) 
 	 - Ignore orphan ".git" folder in the repositories root folder (issue-256)
+	 - Fixed committer verification with merge commits (issue-264)
      - Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped
 	 - Added more error checking to blob page and blame page
 	 - Disable SNI extensions for client SSL connections
@@ -35,6 +40,8 @@
 	 - Fixed submodule diff display
 
 	changes:
+	 - Retrieve summary and metric graphs from Google over https (issue-61)
+	 - Persist originRepository (for forks) in the repository config instead of relying on parsing origin urls which are susceptible to filesystem relocation (issue 190) 
 	 - Improved error logging for servlet containers which provide a null contextFolder (issue 199)
 	 - Improve Gerrit change ref decoration in the refs panel (issue 206)
 	 - Display full commit message on commitdiff page (issue-258)
@@ -56,6 +63,7 @@
 	 - Support header color customizations (issue 209)
 	 - Support username substitution in web.otherUrls (issue 213)
 	 - Option to force client-side basic authentication instead of form-based authentication if web.authenticateViewPages=true (issue 222)
+	 - Set author as tooltip of last change column in the repositories panel (issue-238)
 	 - Setting to automatically create an user account based on an authenticated user principal from the servlet container (issue-246)
 	 - Added WindowsUserService to authenticate users against Windows accounts (issue-250)
 	 - Global and per-repository setting to exclude authors from metrics (issue-251)
@@ -154,12 +162,12 @@
     title: Gitblit 1.2.1 Released
     id: 1.2.1
     date: 2013-01-15
-    note: ''
+    html: ''
           Because there are now several types of files and folders that must be considered Gitblit data, the default location for data has changed.
-          
-          You will need to move a few files around when upgrading.  Please see the Upgrading section of the <a href="setup.html">setup</a> page for details.
-
-          <b>Express Users</b> make sure to update your web.xml file with the ${baseFolder} values!
+          <p />
+          You will need to move a few files around when upgrading.  Please review the <a href="upgrade_go.html">upgrading GO</a> or <a href="upgrade_war.html">upgrading WAR</a> page for details.
+          <p />
+          <b>Express Users</b> make sure to update your web.xml file with the ${baseFolder} values!          
           ''
     fixes:
     - Fixed nullpointer on recursively calculating folder sizes when there is a named pipe or symlink in the hierarchy

--
Gitblit v1.9.1