Documentation.

diff --git a/build.xml b/build.xml
index 6c741c8033745a0feea1ab35e0a17caaa7678af6..c94cbe5a279f95c403ba6ec029068080fd7d3099 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -261,6 +261,10 @@
 \r
                                <arg value="--substitute" />\r
                                <arg value="%ENDCODE%=&lt;/pre&gt;" />\r
+                               \r
+                               <arg value="--regex" />\r
+                               <arg value="&quot;\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;&quot;" />\r
+               \r
                        </java>\r
        </target>\r
        \r
@@ -475,6 +479,9 @@
                        <arg value="--substitute" />\r
                        <arg value="%ENDCODE%=&lt;/pre&gt;" />\r
 \r
+                       <arg value="--regex" />\r
+                       <arg value="&quot;\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;&quot;" />\r
+\r
                </java> \r
        </target>\r
                \r

diff --git a/docs/00_index.mkd b/docs/00_index.mkd
index 62631bcd0ffbdc446afcd57eadaac57fa107b208..efbfe0c88ef85cd5b0aafc99d95f46d6a8228dc8 100644 (file)
--- a/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@ -25,7 +25,8 @@ Gitblit requires a Java 6 Runtime Environment (JRE) or a Java 6 Development Kit
 \r
 - fixed: bare-cloned repositories were listed as (empty) and were not clickable (issue 13)\r
 - fixed: default port for Gitblit GO is now 8443 to be more linux/os x friendly (issue 12)\r
-- fixed: forward-slashes ('/', %2F) can be encoded using a custom character to workaround some servlet container default security measures for proxy servers<br/>**New:** *web.forwardSlashCharacter = /* (issue 11)\r
+- fixed: forward-slashes ('/', %2F) can be encoded using a custom character to workaround some servlet container default security measures for proxy servers (issue 11)<br/>**New:** *web.forwardSlashCharacter = /*\r
+- fixed: repositories can now be reliably deleted and renamed (issue 10)\r
 - fixed: users can now change their passwords (issue 1)\r
 - fixed: always show root repository group first, i.e. don't sort root group with other groups\r
 - fixed: tone-down repository group header color\r

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 13f3dccb7f6338381ca0796d0d857f6b60f39966..91ff2c0218472db949190534df1bf4693f8c1edd 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -5,7 +5,8 @@
 \r
 - fixed: bare-cloned repositories were listed as (empty) and were not clickable (issue 13)\r
 - fixed: default port for Gitblit GO is now 8443 to be more linux/os x friendly (issue 12)\r
-- fixed: forward-slashes ('/', %2F) can be encoded using a custom character to workaround some servlet container default security measures for proxy servers<br/>**New:** *web.forwardSlashCharacter = /* (issue 11)\r
+- fixed: forward-slashes ('/', %2F) can be encoded using a custom character to workaround some servlet container default security measures for proxy servers (issue 11)<br/>**New:** *web.forwardSlashCharacter = /*\r
+- fixed: repositories can now be reliably deleted and renamed (issue 10)\r
 - fixed: users can now change their passwords (issue 1)\r
 - fixed: always show root repository group first, i.e. don't sort root group with other groups\r
 - fixed: tone-down repository group header color\r

diff --git a/src/com/gitblit/build/BuildSite.java b/src/com/gitblit/build/BuildSite.java
index 7d0981b83854f3ed38f5de091ca2a107c00a3af2..c3a7f5f88a8c444dfdba4c6967d76c34662a1ae8 100644 (file)
--- a/src/com/gitblit/build/BuildSite.java
+++ b/src/com/gitblit/build/BuildSite.java
@@ -189,6 +189,10 @@ public class BuildSite {
                                                String[] kv = token.split("=", 2);\r
                                                content = content.replace(kv[0], kv[1]);\r
                                        }\r
+                                       for (String token:params.regex) {\r
+                                               String[] kv = token.split("!!!", 2);\r
+                                               content = content.replaceAll(kv[0], kv[1]);\r
+                                       }\r
                                        for (String alias : params.properties) {\r
                                                String[] kv = alias.split("=", 2);\r
                                                String loadedContent = generatePropertiesContent(new File(kv[1]));\r
@@ -350,5 +354,8 @@ public class BuildSite {
                @Parameter(names = { "--nomarkdown" }, description = "%STARTTOKEN%:%ENDTOKEN%", required = false)\r
                public List<String> nomarkdown = new ArrayList<String>();\r
 \r
+               @Parameter(names = { "--regex" }, description = "searchPattern!!!replacePattern", required = false)\r
+               public List<String> regex = new ArrayList<String>();\r
+\r
        }\r
 }\r