From 06b691211585fbe4049099b15fffb4cdc42cb728 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Jun 2013 15:59:47 -0400
Subject: [PATCH] Do not set cookies for sessions authenticated via certificate or container

---
 src/main/java/com/gitblit/wicket/GitBlitWebApp.properties |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 036af26..0383ee4 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -257,7 +257,7 @@
 gb.canNotLoadRepository = Can not load repository
 gb.commitIsNull = Commit is null
 gb.unauthorizedAccessForRepository = Unauthorized access for repository
-gb.failedToFindCommit = Failed to find commit \"{0}\" in {1} for {2} page!
+gb.failedToFindCommit = Failed to find commit \"{0}\" in {1}!
 gb.couldNotFindFederationProposal = Could not find federation proposal!
 gb.invalidUsernameOrPassword = Invalid username or password!
 gb.OneProposalToReview = There is 1 federation proposal awaiting review. 
@@ -477,7 +477,10 @@
 gb.createdNewTag = created new tag
 gb.deletedTag = deleted tag
 gb.pushedNewBranch = pushed new branch
+gb.createdNewBranch = created new branch
 gb.deletedBranch = deleted branch
+gb.createdNewPullRequest = created pull request
+gb.mergedPullRequest = merged pull request
 gb.rewind = REWIND
 gb.star = star
 gb.unstar = unstar
@@ -485,3 +488,7 @@
 gb.starredRepositories = starred repositories
 gb.failedToUpdateUser = Failed to update user account!
 gb.myRepositories = my repositories
+gb.noActivity = there has been no recent commit activity
+gb.findSomeRepositories = find some repositories
+gb.metricAuthorExclusions = author metric exclusions
+gb.myDashboard = my dashboard
\ No newline at end of file

--
Gitblit v1.9.1