From 7be48d8d14c74dfb10ba3d71f12a78505daf29a6 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gmail.com> Date: Wed, 30 Sep 2015 12:00:35 -0400 Subject: [PATCH] Merge pull request #929 from willyann/develop --- src/main/java/com/gitblit/wicket/pages/BlamePage.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/BlamePage.java b/src/main/java/com/gitblit/wicket/pages/BlamePage.java index c2280a2..e45bbbc 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlamePage.java +++ b/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); } @@ -235,6 +236,11 @@ } @Override + protected boolean isCommitPage() { + return true; + } + + @Override protected Class<? extends BasePage> getRepoNavPageClass() { return TreePage.class; } -- Gitblit v1.9.1