From 10c1f2c7de43d7d47f7b5af78f6de63586ceffeb Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 04 Sep 2014 11:53:34 -0400 Subject: [PATCH] Merge branch 'ticket/144' into develop --- src/main/distrib/data/gitblit.properties | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 65fe41e..483ed6d 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -844,8 +844,18 @@ # SINCE 0.5.0 web.siteName = -# The canonical url of your Gitblit server to bs used in email notifications. -# e.g. web.canonicalUrl = https://demo-gitblit.rhcloud.com +# The canonical url of your Gitblit server to be used in repository url generation, +# RSS feeds, and all embedded links in email and plugin-based notifications. +# +# If you are running Gitblit on a non-standard http port (i.e. not 80 and not 443) +# then you must specify that port in this url otherwise your generated urls will be +# incorrect. +# +# The hostname of this url will be extracted for SSH and GIT protocol repository +# url generation. +# +# e.g. web.canonicalUrl = https://dev.gitblit.com +# web.canonicalUrl = https://dev.gitblit.com:8443 # # SINCE 1.4.0 web.canonicalUrl = @@ -1306,7 +1316,7 @@ # # SPACE-DELIMITED # SINCE 0.5.0 -web.prettyPrintExtensions = aea agc basic c cbm cl clj cpp cs css dart el erl erlang frm fs go groovy hs htm html java js latex lisp ll llvm lsp lua ml moxie mumps n nemerle pascal php pl prefs properties proto py r R rb rd Rd rkt s S scala scm sh Splus sql ss tcl tex vb vbs vhd vhdl wiki xml xq xquery yaml yml ymlapollo +web.prettyPrintExtensions = aea agc basic c cbm cl clj cpp cs css dart el erl erlang frm fs go groovy hs htm html java js latex lisp ll llvm lsp lua ml moxie mumps n nemerle pascal php pl pm prefs properties proto py r R rb rd Rd rkt s S scala scm sh Splus sql ss tcl tex vb vbs vhd vhdl wiki xml xq xquery yaml yml ymlapollo # Registered extensions for markdown transformation # -- Gitblit v1.9.1