Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -154,6 +154,7 @@


      add(new Label("missingBlob").setVisible(false));



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

      List<AnnotatedLine> lines = DiffUtils.blame(getRepository(), blobPath, objectId);

      final Map<?, String> colorMap = initializeColors(activeBlameType, lines);

      ListDataProvider<AnnotatedLine> blameDp = new ListDataProvider<AnnotatedLine>(lines);

@@ -212,7 +213,7 @@
               color = colorMap.get(entry.commitId);

               break;

            }

            Component data = new Label("data", StringUtils.escapeForHtml(entry.data, true)).setEscapeModelStrings(false);

            Component data = new Label("data", StringUtils.escapeForHtml(entry.data, true, tabLength)).setEscapeModelStrings(false);

            data.add(new SimpleAttributeModifier("style", "background-color: " + color + ";"));

            item.add(data);

         }