Merge branch 'ticket/164' into develop

James Moger

2014-09-07 f7174e6984c08a153d1ba198c4bffe68c5afd873

 src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java

@@ -28,6 +28,8 @@
import com.gitblit.models.ServerSettings;
import com.gitblit.models.ServerStatus;
import com.gitblit.models.SettingModel;
import com.gitblit.utils.XssFilter;
import com.gitblit.utils.XssFilter.AllowXssFilter;
import com.google.inject.Injector;

public class MockRuntimeManager implements IRuntimeManager {
@@ -134,6 +136,11 @@
   }

   @Override
   public XssFilter getXssFilter() {
      return new AllowXssFilter();
   }

   @Override
   public boolean updateSettings(Map<String, String> updatedSettings) {
      return settings.saveSettings(updatedSettings);
   }