diff options
| author | James Moger <james.moger@gitblit.com> | 2012-06-15 08:26:19 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-06-15 08:26:19 -0400 |
| commit | e09d4bb6558c7b6c59dec3911138aaaa2a0f4597 (patch) | |
| tree | 4173cdbbee9ae4e49f850f39f1e001a60a813817 | |
| parent | 27506b7e75927e5dd09761f5eed058580b822771 (diff) | |
| download | gitblit-e09d4bb6558c7b6c59dec3911138aaaa2a0f4597.tar.gz gitblit-e09d4bb6558c7b6c59dec3911138aaaa2a0f4597.zip | |
Fixed bug where Manager could not update unreferenced setting (issue 85)
| -rw-r--r-- | docs/04_releases.mkd | 3 | ||||
| -rw-r--r-- | src/com/gitblit/GitBlit.java | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index 342d67b2..8db8f7b1 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -8,6 +8,7 @@ - Fixed bug where a repository set as authenticated push did not have anonymous clone access (issue 96)
- Fixed bug in Basic authentication if passwords had a colon (Github/peterloron)
+- Fixed bug where the Gitblit Manager could not update a setting that was not referenced in reference.properties (issue 85)
#### changes
@@ -17,6 +18,8 @@ #### additions
+- Added setting to allow specification of a robots.txt file (issue 99)
+ **New:** *web.robots.txt = *
- Added setting to control responsive or fixed-width layout (issue 101)
**New:** *web.useResponsiveLayout = true*
- Added setting to control charsets for blob string decoding. Default encodings are UTF-8, ISO-8859-1, and server's default charset. (issue 97)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index dc53540e..eab265ab 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -1823,9 +1823,13 @@ public class GitBlit implements ServletContextListener { // ensure that the current values are updated in the setting models
for (String key : settings.getAllKeys(null)) {
SettingModel setting = settingsModel.get(key);
- if (setting != null) {
- setting.currentValue = settings.getString(key, "");
+ if (setting == null) {
+ // unreferenced setting, create a setting model
+ setting = new SettingModel();
+ setting.name = key;
+ settingsModel.add(setting);
}
+ setting.currentValue = settings.getString(key, "");
}
settingsModel.pushScripts = getAllScripts();
return settingsModel;
|