From 86bea9e0016b2890db8ba83049dd4e89653a0a5e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 16 Mar 2012 17:29:39 -0400
Subject: [PATCH] Ensure that the welcome message is interpreted as UTF-8 (issue 74)
---
src/com/gitblit/models/ServerSettings.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/models/ServerSettings.java b/src/com/gitblit/models/ServerSettings.java
index 47148d3..72a7f00 100644
--- a/src/com/gitblit/models/ServerSettings.java
+++ b/src/com/gitblit/models/ServerSettings.java
@@ -21,8 +21,6 @@
import java.util.Map;
import java.util.TreeMap;
-import com.gitblit.IStoredSettings;
-
/**
* Server settings represents the settings of the Gitblit server including all
* setting metadata such as name, current value, default value, description, and
@@ -37,10 +35,12 @@
private static final long serialVersionUID = 1L;
+ public List<String> pushScripts;
+
public ServerSettings() {
settings = new TreeMap<String, SettingModel>();
}
-
+
public List<String> getKeys() {
return new ArrayList<String>(settings.keySet());
}
@@ -51,13 +51,5 @@
public SettingModel get(String key) {
return settings.get(key);
- }
-
- public void updateCurrentValues(IStoredSettings storedSettings) {
- for (String key : storedSettings.getAllKeys(null)) {
- if (settings.containsKey(key)) {
- settings.get(key).currentValue = storedSettings.getString(key, "");
- }
- }
}
}
--
Gitblit v1.9.1