diff options
| -rw-r--r-- | build.xml | 7 | ||||
| -rw-r--r-- | docs/00_index.mkd | 3 | ||||
| -rw-r--r-- | docs/04_releases.mkd | 3 | ||||
| -rw-r--r-- | src/com/gitblit/build/BuildSite.java | 7 |
4 files changed, 18 insertions, 2 deletions
@@ -261,6 +261,10 @@ <arg value="--substitute" />
<arg value="%ENDCODE%=</pre>" />
+
+ <arg value="--regex" />
+ <arg value=""\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>"" />
+
</java>
</target>
@@ -475,6 +479,9 @@ <arg value="--substitute" />
<arg value="%ENDCODE%=</pre>" />
+ <arg value="--regex" />
+ <arg value=""\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>"" />
+
</java>
</target>
diff --git a/docs/00_index.mkd b/docs/00_index.mkd index 62631bcd..efbfe0c8 100644 --- 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 - fixed: bare-cloned repositories were listed as (empty) and were not clickable (issue 13)
- fixed: default port for Gitblit GO is now 8443 to be more linux/os x friendly (issue 12)
-- 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)
+- 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 = /*
+- fixed: repositories can now be reliably deleted and renamed (issue 10)
- fixed: users can now change their passwords (issue 1)
- fixed: always show root repository group first, i.e. don't sort root group with other groups
- fixed: tone-down repository group header color
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index 13f3dccb..91ff2c02 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -5,7 +5,8 @@ - fixed: bare-cloned repositories were listed as (empty) and were not clickable (issue 13)
- fixed: default port for Gitblit GO is now 8443 to be more linux/os x friendly (issue 12)
-- 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)
+- 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 = /*
+- fixed: repositories can now be reliably deleted and renamed (issue 10)
- fixed: users can now change their passwords (issue 1)
- fixed: always show root repository group first, i.e. don't sort root group with other groups
- fixed: tone-down repository group header color
diff --git a/src/com/gitblit/build/BuildSite.java b/src/com/gitblit/build/BuildSite.java index 7d0981b8..c3a7f5f8 100644 --- 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);
content = content.replace(kv[0], kv[1]);
}
+ for (String token:params.regex) {
+ String[] kv = token.split("!!!", 2);
+ content = content.replaceAll(kv[0], kv[1]);
+ }
for (String alias : params.properties) {
String[] kv = alias.split("=", 2);
String loadedContent = generatePropertiesContent(new File(kv[1]));
@@ -350,5 +354,8 @@ public class BuildSite { @Parameter(names = { "--nomarkdown" }, description = "%STARTTOKEN%:%ENDTOKEN%", required = false)
public List<String> nomarkdown = new ArrayList<String>();
+ @Parameter(names = { "--regex" }, description = "searchPattern!!!replacePattern", required = false)
+ public List<String> regex = new ArrayList<String>();
+
}
}
|