Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/wicket/pages/BlobPage.java

@@ -137,6 +137,7 @@
                  table = missingBlob(blobPath, commit);

               } else {

                  table = generateSourceView(source, extension, type == 1);

                  addBottomScriptInline("jQuery(prettyPrint);");

               }

               add(new Label("blobText", table).setEscapeModelStrings(false));

               add(new Image("blobImage").setVisible(false));

@@ -150,6 +151,7 @@
               table = missingBlob(blobPath, commit);

            } else {

               table = generateSourceView(source, null, false);

               addBottomScriptInline("jQuery(prettyPrint);");

            }

            add(new Label("blobText", table).setEscapeModelStrings(false));

            add(new Image("blobImage").setVisible(false));

@@ -193,7 +195,8 @@
      } else {

         sb.append("<pre class=\"plainprint\">");

      }

      lines = StringUtils.escapeForHtml(source, true).split("\n");

      final int tabLength = app().settings().getInteger(Keys.web.tabLength, 4);

      lines = StringUtils.escapeForHtml(source, true, tabLength).split("\n");



      sb.append("<table width=\"100%\"><tbody>");