From 399b9b6769908f98e4dfb9658d3f9fae0ee03719 Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@benjamins-mbp.fritz.box>
Date: Sat, 04 Jan 2014 10:29:12 -0500
Subject: [PATCH] Evaluate X_Forwarded_Context only when X-Forwarded-Context is not set
---
src/main/java/com/gitblit/wicket/panels/RefsPanel.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
index 1a76311..7a16f4a 100644
--- a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
@@ -122,11 +122,13 @@
cssClass = "otherRef";
} else if (name.startsWith(Constants.R_PULL)) {
// Pull Request ref
- name = "pull #" + name.substring(Constants.R_PULL.length());
- if (name.endsWith("/head")) {
+ String num = name.substring(Constants.R_PULL.length());
+ if (num.endsWith("/head")) {
// strip pull request head from name
- name = name.substring(0, name.length() - "/head".length());
+ num = num.substring(0, num.length() - "/head".length());
}
+ name = "pr #" + num;
+ tooltip = "pull request #" + num;
cssClass = "pullRef";
} else if (name.startsWith(Constants.R_REMOTES)) {
// remote branch
--
Gitblit v1.9.1