From 15ffec4678fd27abdade9a142b441c9b683fea38 Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy.zelinskie@coreos.com>
Date: Fri, 3 Apr 2015 17:18:28 -0400
Subject: [PATCH] custom trigger: fix git url regex

---
 static/directives/trigger-setup-custom.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/static/directives/trigger-setup-custom.html b/static/directives/trigger-setup-custom.html
index bb49d568b..8e3ba47c6 100644
--- a/static/directives/trigger-setup-custom.html
+++ b/static/directives/trigger-setup-custom.html
@@ -10,7 +10,7 @@
         <td>Dockerfile Location:</td>
         <td>
           <div class="dockerfile-location">
-            <i class="fa fa-folder fa-lg"></i> {{ state.subdir == '/' || !state.subdir ? '(Repository Root)' : subdir }}
+            <i class="fa fa-folder fa-lg"></i> {{ state.subdir || '/' }}
           </div>
         </td>
     </table>
@@ -23,9 +23,9 @@
     <!-- Git URL Input -->
     <div class="step-view-step" complete-condition="trigger['config']['build_source']" load-callback="nopLoad(callback)"
          load-message="Loading Git URL Input">
-      <div style="margin-bottom: 12px;">Please enter the URL used to clone your git repository:</div>
-      <input class="form-control" type="text" placeholder="git://example.com/namespace/repository.git" style="width: 100%;"
-             ng-model="state.build_source" ng-pattern="/(git|http|https):\/\/(.+)(\.git)/">
+      <div style="margin-bottom: 12px;">Please enter an HTTP or SSH style URL used to clone your git repository:</div>
+      <input class="form-control" type="text" placeholder="git@example.com:namespace/repository.git" style="width: 100%;"
+             ng-model="state.build_source" ng-pattern="/(((http|https):\/\/)(.+)|\w+@(.+):(.+))/">
     </div>
 
     <!-- Dockerfile folder select -->