summaryrefslogtreecommitdiffstats
path: root/distrib
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-06-02 22:40:23 -0400
committerJames Moger <james.moger@gitblit.com>2011-06-02 22:40:23 -0400
commita125cf6876e0edc5a2498df57a9df06d60b1f572 (patch)
tree7e0757213e7b69c7e97c0fe7ac4b7e2edfc41b81 /distrib
parent793f76563d4bb3f58fa62ff53985e20561c6e330 (diff)
downloadgitblit-a125cf6876e0edc5a2498df57a9df06d60b1f572.tar.gz
gitblit-a125cf6876e0edc5a2498df57a9df06d60b1f572.zip
Unit testing. Start of git-notes display feature.
Diffstat (limited to 'distrib')
-rw-r--r--distrib/gitblit.properties7
-rw-r--r--distrib/users.properties2
2 files changed, 6 insertions, 3 deletions
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index c17674ab..5c6603a0 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -17,9 +17,12 @@ git.repositoriesFolder = git
# if false, each exported repository must have a .git/git-daemon-export-ok file
git.exportAll = true
-# Search repositories folder for nested repositories
+# Search the repositories folder subfolders for other repositories.
+# Repositories MAY NOT be nested (i.e. one repository within another)
+# but they may be grouped together in subfolders.
# e.g. c:/gitrepos/libraries/mylibrary.git
-git.nestedRepositories = true
+# c:/gitrepos/libraries/myotherlibrary.git
+git.searchRepositoriesSubfolders = true
#
# Authentication Settings
diff --git a/distrib/users.properties b/distrib/users.properties
index 233e9f93..a7ebc678 100644
--- a/distrib/users.properties
+++ b/distrib/users.properties
@@ -1,3 +1,3 @@
## Git:Blit realm file format: username=password,\#permission,repository1,repository2...
-#Tue May 31 11:19:53 EDT 2011
+#Thu Jun 02 22:11:15 EDT 2011
admin=admin,\#admin