Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/test/java/com/gitblit/tests/StringUtilsTest.java

@@ -50,7 +50,7 @@
   public void testEscapeForHtml() throws Exception {

      String input = "& < > \" \t";

      String outputNoChange = "&amp; &lt; &gt; &quot; \t";

      String outputChange = "&amp;&nbsp;&lt;&nbsp;&gt;&nbsp;&quot;&nbsp; &nbsp; &nbsp;";

      String outputChange = "&amp;&nbsp;&lt;&nbsp;&gt;&nbsp;&quot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";

      assertEquals(outputNoChange, StringUtils.escapeForHtml(input, false));

      assertEquals(outputChange, StringUtils.escapeForHtml(input, true));

   }