From e55841f38e3b8c1c88acad20944a15e49a2e5504 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 05 Mar 2014 17:35:43 -0500
Subject: [PATCH] Merge pull request #147 from Mrbytes/master
---
build.xml | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/build.xml b/build.xml
index 5385e26..71e7430 100644
--- a/build.xml
+++ b/build.xml
@@ -566,6 +566,13 @@
<page name="eclipse plugin" src="eclipse_plugin.mkd" />
</menu>
<divider />
+ <menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="overview" src="tickets_overview.mkd" />
+ <page name="using" src="tickets_using.mkd" />
+ <page name="barnum" src="tickets_barnum.mkd" />
+ <page name="setup" src="tickets_setup.mkd" />
+ </menu>
+ <divider />
<page name="federation" src="federation.mkd" />
<divider />
<page name="settings" src="properties.mkd" />
@@ -602,11 +609,17 @@
<link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />
<link name="Gitblit Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
<divider />
+ <link name="Gitblit (Self-Hosted)" src="https://dev.gitblit.com" />
+ <divider />
<link name="Github" src="${project.scmUrl}" />
<link name="Issues" src="${project.issuesUrl}" />
<link name="Discussion" src="${project.forumUrl}" />
<link name="Google+" src="${project.socialNetworkUrl}" />
+ <link name="Twitter" src="https://twitter.com/gitblit" />
<link name="Ohloh" src="http://www.ohloh.net/p/gitblit" />
+ <divider />
+ <link name="+JamesMoger" src="https://plus.google.com/+JamesMoger" />
+ <link name="@JamesMoger" src="https://twitter.com/JamesMoger" />
</menu>
<divider />
</structure>
@@ -617,6 +630,7 @@
<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>" />
<regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='https://github.com/gitblit/gitblit/pull/$3'>pull request #$3</a>" />
+ <regex searchPattern="\b(ticket)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='https://dev.gitblit.com/tickets/gitblit.git/$3'>ticket $3</a>" />
<!-- Set the logo from the mx:doc resources -->
<logo file="${project.resources.dir}/gitblt_25_white.png" />
@@ -890,6 +904,13 @@
<page name="eclipse plugin" src="eclipse_plugin.mkd" />
</menu>
<divider />
+ <menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="overview" src="tickets_overview.mkd" />
+ <page name="using" src="tickets_using.mkd" />
+ <page name="barnum" src="tickets_barnum.mkd" />
+ <page name="setup" src="tickets_setup.mkd" />
+ </menu>
+ <divider />
<page name="federation" src="federation.mkd" />
<divider />
<page name="settings" src="properties.mkd" />
@@ -918,6 +939,7 @@
<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>" />
<regex searchPattern="\b(pr|pull request)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='https://github.com/gitblit/gitblit/pull/$3'>pull request #$3</a>" />
+ <regex searchPattern="\b(ticket)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<a href='https://dev.gitblit.com/tickets/gitblit.git/$3'>ticket $3</a>" />
<!-- Set the logo from the mx:doc resources -->
<logo file="${project.resources.dir}/gitblt_25_white.png" />
@@ -975,6 +997,7 @@
<include name="thebuggenie.groovy" />
<include name="fisheye.groovy" />
<include name="redmine-fetch.groovy" />
+ <include name="subgit.groovy" />
</fileset>
</copy>
</sequential>
--
Gitblit v1.9.1