From ea61c13bc58094effac06bd98ab65097a399c47d Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Thu, 16 Jun 2016 17:03:35 +0100 Subject: [PATCH 1/3] chore(package): update ember-suave to version 3.0.1 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 856049a59ce..63c8c457f73 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "ember-page-title": "2.0.7", "ember-rl-dropdown": "0.7.0", "ember-route-alias": "^0.1.3", - "ember-suave": "1.2.3", + "ember-suave": "3.0.1", "emberx-select": "2.1.2", "loader.js": "4.0.9" }, From 872e1a4546df65ffb2ef3e6aad0f04628ecdfd30 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Fri, 17 Jun 2016 06:25:31 -0400 Subject: [PATCH 2/3] Update ember-suave to 2.0.0 --- .jscsrc | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.jscsrc b/.jscsrc index 0b9196ce3fb..a8a6748dee5 100644 --- a/.jscsrc +++ b/.jscsrc @@ -5,5 +5,7 @@ "requireCamelCaseOrUpperCaseIdentifiers": null, "requireCommentsToIncludeAccess": null, "requireParenthesesAroundArrowParam": null, - "validateIndentation": 4 + "validateIndentation": 4, + "disallowConstOutsideModuleScope": false, + "requireSpread": false } diff --git a/package.json b/package.json index 63c8c457f73..cffb5a2d454 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "ember-page-title": "2.0.7", "ember-rl-dropdown": "0.7.0", "ember-route-alias": "^0.1.3", - "ember-suave": "3.0.1", + "ember-suave": "2.0.0", "emberx-select": "2.1.2", "loader.js": "4.0.9" }, From 7e93d29f3e8424880386341bd877d279145cb0b0 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Fri, 17 Jun 2016 06:29:13 -0400 Subject: [PATCH 3/3] Update ember-suave to 3.0.1 --- .jscsrc | 3 ++- app/router.js | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.jscsrc b/.jscsrc index a8a6748dee5..22fc35fe7fe 100644 --- a/.jscsrc +++ b/.jscsrc @@ -7,5 +7,6 @@ "requireParenthesesAroundArrowParam": null, "validateIndentation": 4, "disallowConstOutsideModuleScope": false, - "requireSpread": false + "requireSpread": false, + "disallowDirectPropertyAccess": false } diff --git a/app/router.js b/app/router.js index 657923c0e44..d858f0d5c9a 100644 --- a/app/router.js +++ b/app/router.js @@ -32,8 +32,8 @@ Router.map(function() { this.route('dashboard'); this.route('keywords'); this.route('keyword', { path: '/keywords/:keyword_id' }, function() { - this.route('index', { path: '/' }); - }); + this.route('index', { path: '/' }); + }); this.route('catchAll', { path: '*path' }); }); diff --git a/package.json b/package.json index cffb5a2d454..63c8c457f73 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "ember-page-title": "2.0.7", "ember-rl-dropdown": "0.7.0", "ember-route-alias": "^0.1.3", - "ember-suave": "2.0.0", + "ember-suave": "3.0.1", "emberx-select": "2.1.2", "loader.js": "4.0.9" },