From b37a85483d5917594a22a39c17d175961645f29c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Wed, 20 Feb 2019 17:42:17 +0000
Subject: [PATCH 1/2] Bump octicons from 8.3.0 to 8.4.2

Bumps [octicons](https://github.com/primer/octicons) from 8.3.0 to 8.4.2.
- [Release notes](https://github.com/primer/octicons/releases)
- [Changelog](https://github.com/primer/octicons/blob/master/CHANGELOG.md)
- [Commits](https://github.com/primer/octicons/commits)

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

diff --git a/package.json b/package.json
index f8c2d9b7..c03a24e2 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "eslint-plugin-ember": "^6.0.0",
     "eslint-plugin-node": "^8.0.0",
     "loader.js": "^4.7.0",
-    "octicons": "~8.3.0"
+    "octicons": "~8.4.2"
   },
   "engines": {
     "node": "6.* || 8.* || >= 10.*"
diff --git a/yarn.lock b/yarn.lock
index e903b528..68ec254b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7548,10 +7548,10 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-octicons@~8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/octicons/-/octicons-8.3.0.tgz#88206818d8b531317ede7d5e1bb53beee62b7a9e"
-  integrity sha512-zyc72Pz2TV4Ae3pcrmy9zUhG9QFU1CtS682Cp6fV4o36fskN+RJsaA1L5bFg6xMASDPX+glnjv0B7Tp1uz6J5A==
+octicons@~8.4.2:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/octicons/-/octicons-8.4.2.tgz#1867cb5157b9f928ef80f284543d04d11514789a"
+  integrity sha512-rl6FPFU8rWP7PUP6aoyBjm/VXhshWV0QglEMCHglyh5gCHQZozioq61bM40bvtxKJ910iqwANuuXT039Ke6I+Q==
   dependencies:
     object-assign "^4.1.1"
 

From 9b4f6f78fc1f7f803574d742121665a787abe45e Mon Sep 17 00:00:00 2001
From: Kevin Pfefferle <kevin.pfefferle@addepar.com>
Date: Wed, 20 Feb 2019 12:56:28 -0500
Subject: [PATCH 2/2] Allow Octicons 8.x

---
 blueprints/ember-octicons/index.js | 2 +-
 package.json                       | 4 ++--
 yarn.lock                          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blueprints/ember-octicons/index.js b/blueprints/ember-octicons/index.js
index 9fc5825b..58ebe940 100644
--- a/blueprints/ember-octicons/index.js
+++ b/blueprints/ember-octicons/index.js
@@ -2,6 +2,6 @@ module.exports = {
   normalizeEntityName() {}, // no-op since we're just adding dependencies
 
   afterInstall() {
-    return this.addPackageToProject('octicons', '~8.3.0');
+    return this.addPackageToProject('octicons', '^8.0.0');
   }
 }
diff --git a/package.json b/package.json
index c03a24e2..1b3c7948 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "glob": "^7.1.2"
   },
   "peerDependencies": {
-    "octicons": "^7.2.0"
+    "octicons": "^8.0.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^0.7.0",
@@ -60,7 +60,7 @@
     "eslint-plugin-ember": "^6.0.0",
     "eslint-plugin-node": "^8.0.0",
     "loader.js": "^4.7.0",
-    "octicons": "~8.4.2"
+    "octicons": "^8.4.2"
   },
   "engines": {
     "node": "6.* || 8.* || >= 10.*"
diff --git a/yarn.lock b/yarn.lock
index 68ec254b..ce2cde4b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7548,7 +7548,7 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-octicons@~8.4.2:
+octicons@^8.4.2:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/octicons/-/octicons-8.4.2.tgz#1867cb5157b9f928ef80f284543d04d11514789a"
   integrity sha512-rl6FPFU8rWP7PUP6aoyBjm/VXhshWV0QglEMCHglyh5gCHQZozioq61bM40bvtxKJ910iqwANuuXT039Ke6I+Q==