summaryrefslogtreecommitdiffstats
path: root/src/site/upgrade_go.mkd
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-10-27 08:21:09 -0600
committerJames Moger <james.moger@gitblit.com>2014-10-27 08:21:09 -0600
commit959ec25027f1bce091dcd9cc2d93c721ff2dc35d (patch)
treee486beb089b2c66b7311063688126c5c9dad0839 /src/site/upgrade_go.mkd
parent3faf6f6469759538590aa7f1012c543f95583c56 (diff)
parent17ae31a20e9ad1294bc8a872644d90d61a9dd890 (diff)
downloadgitblit-959ec25027f1bce091dcd9cc2d93c721ff2dc35d.tar.gz
gitblit-959ec25027f1bce091dcd9cc2d93c721ff2dc35d.zip
Merged #110 "Support multiple/chained config files"
Diffstat (limited to 'src/site/upgrade_go.mkd')
-rw-r--r--src/site/upgrade_go.mkd14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/site/upgrade_go.mkd b/src/site/upgrade_go.mkd
index 54d7ab59..a0092588 100644
--- a/src/site/upgrade_go.mkd
+++ b/src/site/upgrade_go.mkd
@@ -1,3 +1,17 @@
+## Upgrading Gitblit GO (1.7.0+)
+
+The default `gitblit.properties` file has been split into two files: `gitblit.properties`, which is the recommended file for setting your configuration, and `defaults.properties` which are Gitblit's default settings.
+
+ # Include Gitblit's 'defaults.properties' within your configuration.
+ #
+ # COMMA-DELIMITED
+ # SINCE 1.7.0
+ include = defaults.properties
+
+Notice that the default settings are *included* by your `gitblit.properties` file. The disadvantage to this approach is you must flip between discovering/reading the settings in `defaults.properties` and setting them in `gitblit.properties`, but there are some clear advantages too. This setup is not required. You may continue to keep all your settings in `gitblit.properties` like before.
+
+Additionally you may find it useful if you are maintaining several Gitblit instances to share common properties files.
+
## Upgrading Gitblit GO (1.2.1+)
1. Unzip Gitblit GO to a new folder