diff options
| -rw-r--r-- | releases.moxie | 3 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/releases.moxie b/releases.moxie index ba6951e2..a8b2f4c4 100644 --- a/releases.moxie +++ b/releases.moxie @@ -31,7 +31,8 @@ r17: { - Disable SNI extensions for client SSL connections
- Fixed prettify language extension loading
- Fixed index out of bounds exceptions when generating client certificates for a user when the user's table has been filtered
- - Fixed AddindexedBranch tool when specifying the non-default branch.
+ - Fixed AddindexedBranch tool when specifying the non-default branch.
+ - Fixed submodule diff display
changes:
- Improved error logging for servlet containers which provide a null contextFolder (issue 199)
diff --git a/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java b/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java index f871e778..62966de0 100644 --- a/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java +++ b/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java @@ -157,7 +157,19 @@ public class GitBlitDiffFormatter extends GitWebDiffFormatter { sb.append("<table><tbody>");
inFile = true;
} else {
+ boolean gitLinkDiff = line.length() > 0 && line.substring(1).startsWith("Subproject commit");
+ if (gitLinkDiff) {
+ sb.append("<tr><th></th><th></th>");
+ if (line.charAt(0) == '+') {
+ sb.append("<td><div class=\"diff add2\">");
+ } else {
+ sb.append("<td><div class=\"diff remove2\">");
+ }
+ }
sb.append(line);
+ if (gitLinkDiff) {
+ sb.append("</div></td></tr>");
+ }
}
}
sb.append("</table></div>");
|