From 80ae3fd3109cf5c445559983bb461b37d6b9118d Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy.zelinskie@coreos.com>
Date: Thu, 19 Mar 2015 15:13:03 -0400
Subject: [PATCH] trigger-service: specific callback URLs for GH-git

---
 endpoints/callbacks.py                | 1 +
 static/js/services/trigger-service.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/endpoints/callbacks.py b/endpoints/callbacks.py
index b6629bbfc..506443028 100644
--- a/endpoints/callbacks.py
+++ b/endpoints/callbacks.py
@@ -249,6 +249,7 @@ def github_oauth_attach():
 @callback.route('/github/callback/trigger/<path:repository>', methods=['GET'])
 @callback.route('/github/callback/trigger/<path:repository>/__new', methods=['GET'])
 @callback.route('/github/callback/trigger/<path:repostiory>/__git', methods=['GET'])
+@callback.route('/github/callback/trigger/<path:repostiory>/__git/__new', methods=['GET'])
 @route_show_if(features.GITHUB_BUILD)
 @require_session_login
 @parse_repository_name
diff --git a/static/js/services/trigger-service.js b/static/js/services/trigger-service.js
index e7eea560b..426d5b4b6 100644
--- a/static/js/services/trigger-service.js
+++ b/static/js/services/trigger-service.js
@@ -63,7 +63,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
       ],
       'get_redirect_url': function(namespace, repository) {
         var redirect_uri = KeyService['githubRedirectUri'] + '/trigger/' +
-          namespace + '/' + repository;
+          namespace + '/' + repository + '/__git';
 
         // TODO(jschorr): Remove once the new layout is in place.
         if (CookieService.get('quay.exp-new-layout') == 'true') {