summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2013-05-24 17:38:12 -0400
committerJames Moger <james.moger@gitblit.com>2013-05-24 17:38:12 -0400
commit51c76e7366c2e8851f1639fbdbf2b8deb219c7fc (patch)
treed7b31518f32a96202e2894d20c927b32426502c5 /src/main/java
parent04ef9f9ec3fcec42bbfd00d5f497a51ff84a068e (diff)
downloadgitblit-51c76e7366c2e8851f1639fbdbf2b8deb219c7fc.tar.gz
gitblit-51c76e7366c2e8851f1639fbdbf2b8deb219c7fc.zip
Added support for displaying refs/pull/n/head|merge
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/gitblit/wicket/panels/RefsPanel.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
index 5776a13e..dc852e2e 100644
--- a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
@@ -43,6 +43,8 @@ public class RefsPanel extends Panel {
private static final long serialVersionUID = 1L;
private static final String R_CHANGES = "refs/changes/";
+
+ private static final String R_PULL= "refs/pull/";
public RefsPanel(String id, final String repositoryName, RevCommit c,
Map<ObjectId, List<RefModel>> refs) {
@@ -114,6 +116,14 @@ public class RefsPanel extends Panel {
// Gerrit change ref
name = name.substring(R_CHANGES.length());
cssClass = "otherRef";
+ } else if (name.startsWith(R_PULL)) {
+ // Pull Request ref
+ name = "pull #" + name.substring(R_PULL.length());
+ if (name.endsWith("/head")) {
+ // strip pull request head from name
+ name = name.substring(0, name.length() - "/head".length());
+ }
+ cssClass = "pullRef";
} else if (name.startsWith(Constants.R_REMOTES)) {
// remote branch
linkClass = LogPage.class;