From 366118a9b883ff541e66102b54966d89b556891a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2020 12:58:40 +0000
Subject: [PATCH 1/2] Bump ember-router-scroll from 1.3.3 to 2.0.0

Bumps [ember-router-scroll](https://github.com/dockyard/ember-router-scroll) from 1.3.3 to 2.0.0.
- [Release notes](https://github.com/dockyard/ember-router-scroll/releases)
- [Changelog](https://github.com/DockYard/ember-router-scroll/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dockyard/ember-router-scroll/compare/1.3.3...2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4517cf59f79..63d05ca80d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38068,13 +38068,13 @@
       }
     },
     "ember-router-scroll": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/ember-router-scroll/-/ember-router-scroll-1.3.3.tgz",
-      "integrity": "sha512-SwGsX7kceLXd3AZtKFcM/Ggl5lw37/a1v2rYHwWKZNMiyICBctJmWeEvALLQpiNzT8YMJrJHBkucHFmG07JPXQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ember-router-scroll/-/ember-router-scroll-2.0.0.tgz",
+      "integrity": "sha512-dUQVk2XH+Ynt9kghpaLwvK9w+Ck1FM61bfWM94vVgoGe5TeN1sdC+d9DFRMgEXnski0WSG7WIDal5/P6SPlOHA==",
       "dev": true,
       "requires": {
         "ember-app-scheduler": "^1.0.5",
-        "ember-cli-babel": "^7.1.2",
+        "ember-cli-babel": "^7.11.1",
         "ember-compatibility-helpers": "^1.1.2"
       }
     },
diff --git a/package.json b/package.json
index 4d3917c2941..5abc86d1c55 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "ember-prism": "^0.5.0",
     "ember-promise-helpers": "^1.0.9",
     "ember-resolver": "^7.0.0",
-    "ember-router-scroll": "^1.3.3",
+    "ember-router-scroll": "^2.0.0",
     "ember-template-lint": "^1.13.2",
     "ember-source": "~3.16.0",
     "ember-svg-jar": "^2.2.3",

From aa4292ad1e38e5dbd2e8d20c654453145c284503 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias.bieniek@gmail.com>
Date: Sun, 2 Feb 2020 17:22:50 +0100
Subject: [PATCH 2/2] router: Adjust `Router` base class

---
 app/router.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/router.js b/app/router.js
index f604935288a..ecc0e942a97 100644
--- a/app/router.js
+++ b/app/router.js
@@ -1,8 +1,7 @@
-import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 import RouterScroll from 'ember-router-scroll';
 
-export default class Router extends EmberRouter.extend(RouterScroll) {
+export default class Router extends RouterScroll {
   location = config.locationType;
   rootURL = config.rootURL;
 }