From 78dc06a87f82ed19e3eebe1f16dc6c1bdaf5fbc5 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 31 Jan 2012 09:35:30 -0500 Subject: [PATCH] Merge pull request #6 from lemval/master --- src/com/gitblit/wicket/GitBlitWebApp.properties | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index aead2c4..f039a36 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -131,6 +131,8 @@ gb.sendProposal propose gb.status = status gb.origin = origin +gb.defaultHead = default HEAD +gb.defaultHeadDescription = current branch after clone. e.g. refs/heads/master gb.federationStrategy = federation strategy gb.federationRegistration = federation registration gb.federationResults = federation pull results @@ -197,8 +199,16 @@ gb.emptyRepository = empty repository gb.repositoryUrl = repository url gb.mailingLists = mailing lists -gb.mailingListsDescription = used by the sendmail hook gb.preReceiveScripts = pre-receive scripts gb.postReceiveScripts = post-receive scripts gb.hookScripts = hook scripts -gb.accessPermissions = access permissions \ No newline at end of file +gb.accessPermissions = access permissions +gb.filters = filters +gb.generalDescription = common settings +gb.accessPermissionsDescription = restrict access by users and teams +gb.accessPermissionsForUserDescription = set team memberships or grant access to specific restricted repositories +gb.accessPermissionsForTeamDescription = set team members and grant access to specific restricted repositories +gb.federationRepositoryDescription = share this repository with other Gitblit servers +gb.hookScriptsDescription = run Groovy scripts on pushes to this Gitblit server +gb.reset = reset +gb.pages = pages \ No newline at end of file -- Gitblit v1.9.1