diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 17:01:30 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 17:01:30 +0200 |
| commit | 7d1456c585488d31dab8429ac6ffa959441c83fb (patch) | |
| tree | 15d4b264052d56c26c523ab9470488585e252fa5 /ikiwiki.setup | |
| parent | f96b7a3d174bdb8429781a2e5e9ddc2137d9414e (diff) | |
| parent | 3859a1938ba5d0f0eb30c2a15d3b6b628c667ef9 (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_da.setup
ikiwiki_nb.setup
Diffstat (limited to 'ikiwiki.setup')
| -rw-r--r-- | ikiwiki.setup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup index 6a18fa4..b7124ee 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -151,9 +151,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 |