Persist fork origin on first run after upgrade

diff --git a/releases.moxie b/releases.moxie
index 8cff77117eb77981204aa8c36bbc18ec858010d6..3772ed43d11fdc9adf110ab5b73dcea4c04182c9 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -5,6 +5,9 @@ r17: {
     title: Gitblit ${project.version} Released\r
     id: ${project.version}\r
     date: ${project.buildDate}\r
+    note: ''\r
+          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.\r
+          ''\r
        security:\r
        - 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)\r
     fixes:\r
@@ -159,12 +162,12 @@ r16: {
     title: Gitblit 1.2.1 Released\r
     id: 1.2.1\r
     date: 2013-01-15\r
-    note: ''\r
+    html: ''\r
           Because there are now several types of files and folders that must be considered Gitblit data, the default location for data has changed.\r
-          \r
-          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.\r
-\r
-          <b>Express Users</b> make sure to update your web.xml file with the ${baseFolder} values!\r
+          <p />\r
+          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.\r
+          <p />\r
+          <b>Express Users</b> make sure to update your web.xml file with the ${baseFolder} values!          \r
           ''\r
     fixes:\r
     - Fixed nullpointer on recursively calculating folder sizes when there is a named pipe or symlink in the hierarchy\r

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 6f2f70cca5b4cb47130bd92d5076662a0f52ec21..301591f5d71f06d8b90f9f1d0de14cca13972e4b 100644 (file)
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -2052,6 +2052,9 @@ public class GitBlit implements ServletContextListener {
                                        File repoFolder = new File(getRepositoriesFolder(), originRepo);
                                        if (repoFolder.exists()) {
                                                model.originRepository = originRepo.toLowerCase();
+                                               
+                                               // persist the fork origin
+                                               updateConfiguration(r, model);
                                        }
                                }
                        } catch (URISyntaxException e) {