From 35bb2253c9ff0dcc44f3245026a141fde6415153 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 19:03:46 -0400
Subject: [PATCH] Merge non-fast-forward for release branch merges
---
src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java b/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
index 8e518de..54be539 100644
--- a/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
+++ b/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
@@ -17,6 +17,7 @@
import java.io.File;
import java.util.Date;
+import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
@@ -71,11 +72,31 @@
}
@Override
+ public Locale getLocale() {
+ return Locale.getDefault();
+ }
+
+ @Override
public boolean isServingRepositories() {
return true;
}
@Override
+ public boolean isServingHTTP() {
+ return true;
+ }
+
+ @Override
+ public boolean isServingGIT() {
+ return true;
+ }
+
+ @Override
+ public boolean isServingSSH() {
+ return true;
+ }
+
+ @Override
public boolean isDebugMode() {
return true;
}
--
Gitblit v1.9.1