summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-31 16:59:18 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-31 16:59:18 +0200
commit4886022fef7cfdbf2eae1f93afe0fa0131b37d55 (patch)
treedb7ae6812a68eee40b21d64c6385de61bc17d997
parent612b406475429d006fd7a546288abf6021c7c5f5 (diff)
parent217ddd44b3509820a69168a2f59758a0c6c7333a (diff)
Merge branch '_nb' into allinone-nb
-rw-r--r--ikiwiki_nb.setup4
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index 6e1a7f9..6ea0bf9 100644
--- a/ikiwiki_nb.setup
+++ b/ikiwiki_nb.setup
@@ -152,9 +152,9 @@ use IkiWiki::Setup::Standard {
# mode for git_wrapper (can safely be made suid)
git_wrappermode => '06755',
# gitweb url to show file history ([[file]] substituted)
- #historyurl => 'http://' . $githost . '/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master
+ #historyurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]]', # ;hb=master
# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
- #diffurl => 'http://' . $githost . '/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
+ #diffurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
# where to pull and push changes (set to empty string to disable)
#gitorigin_branch => 'samplewiki',
# branch that the wiki is stored in