From 7fb8d1209a3926329638fc3ca5f0b4bc428029f6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 13 Jun 2014 08:54:26 -0400
Subject: [PATCH] Catch flotr2 exceptions, otherwise downstream AngularJS doesn't execute
---
src/main/java/com/gitblit/wicket/pages/propose_git.md | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/propose_git.md b/src/main/java/com/gitblit/wicket/pages/propose_git.md
index 1b4f429..39ff859 100644
--- a/src/main/java/com/gitblit/wicket/pages/propose_git.md
+++ b/src/main/java/com/gitblit/wicket/pages/propose_git.md
@@ -1,6 +1,6 @@
git clone ${url}
cd ${repo}
- git checkout -b ${reviewBranch} ${integrationBranch}
+ git checkout -b ${reviewBranch} origin/${integrationBranch}
...
- git push origin HEAD:refs/for/${ticketId}
- git branch --set-upstream-to=origin/${reviewBranch}
+ git push --set-upstream origin ${reviewBranch}
+
--
Gitblit v1.9.1