From a63188ae13d96a65ed49437737084ef5e497d1b0 Mon Sep 17 00:00:00 2001
From: Lisa P <mail@lislis.de>
Date: Wed, 13 Jan 2016 14:28:22 +0100
Subject: [PATCH 1/2] add explicit signin route

---
 app/router.js        |  1 +
 app/routes/signin.js | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 app/routes/signin.js

diff --git a/app/router.js b/app/router.js
index 9ee77a1f..f3dc6022 100644
--- a/app/router.js
+++ b/app/router.js
@@ -74,6 +74,7 @@ Router.map(function() {
 
   this.route('first_sync');
   this.route('insufficient_oauth_permissions');
+  this.route('signin');
   this.route('auth');
   this.route('home');
   this.route('home-pro', { path: '/home-pro' });
diff --git a/app/routes/signin.js b/app/routes/signin.js
new file mode 100644
index 00000000..3ec407f0
--- /dev/null
+++ b/app/routes/signin.js
@@ -0,0 +1,15 @@
+import TravisRoute from 'travis/routes/basic';
+
+export default TravisRoute.extend({
+  needsAuth: false,
+
+  renderTemplate() {
+    $('body').attr('id', 'auth');
+    return this.render('auth.signin');
+  },
+
+  activate() {
+    return this.auth.signIn();
+  }
+
+});

From 5163e5129b0941bcde9dd235ce23eb3f74bed698 Mon Sep 17 00:00:00 2001
From: Lisa P <mail@lislis.de>
Date: Wed, 13 Jan 2016 14:49:04 +0100
Subject: [PATCH 2/2] pin jquery version

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 8aa3f50d..5fdfcb84 100644
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,7 @@
     "ember-load-initializers": "0.1.7",
     "ember-qunit": "0.4.16",
     "ember-qunit-notifications": "0.1.0",
-    "jquery": "^1.11.3",
+    "jquery": "~1.11.3",
     "loader.js": "ember-cli/loader.js#3.2.1",
     "qunit": "~1.20.0",
     "visibilityjs": "~1.2.1",