From d69d73e5da5a12f279d5c0c38c871801739f33d6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 May 2014 13:31:56 -0400
Subject: [PATCH] Switch to -u from deprecated --set-upstream
---
src/main/java/com/gitblit/manager/GitblitManager.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index 790445a..5b16ef6 100644
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -27,6 +27,7 @@
import java.util.Collection;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
@@ -606,6 +607,11 @@
}
@Override
+ public Locale getLocale() {
+ return runtimeManager.getLocale();
+ }
+
+ @Override
public boolean isDebugMode() {
return runtimeManager.isDebugMode();
}
--
Gitblit v1.9.1