From a10ad3767f60ed2c8e56feb49e7bf83d9618b2ab Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Wed, 28 Aug 2019 10:17:53 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20text=20editing=20display?=
 =?UTF-8?q?=20of=20markdown,=20html,=20and=20code=20cards?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes https://github.com/TryGhost/Ghost/issues/11056

- reverts codemirror dependency
- adds codemirror to the list of ignored dependencies for renovate to prevent auto-updating
---
 ghost/admin/package.json  | 6 +++---
 ghost/admin/renovate.json | 3 ++-
 ghost/admin/yarn.lock     | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index b07a839f23..868ad4166a 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -33,6 +33,7 @@
     "@tryghost/kg-clean-basic-html": "0.1.2",
     "@tryghost/kg-parser-plugins": "0.7.0",
     "@tryghost/mobiledoc-kit": "0.11.2-ghost.4",
+    "@tryghost/string": "^0.1.5",
     "@tryghost/timezone-data": "0.2.7",
     "autoprefixer": "9.6.1",
     "blueimp-md5": "2.11.1",
@@ -42,7 +43,7 @@
     "broccoli-merge-trees": "3.0.2",
     "broccoli-uglify-sourcemap": "3.1.1",
     "chai-dom": "1.8.1",
-    "codemirror": "5.48.4",
+    "codemirror": "5.48.2",
     "csscomb": "4.3.0",
     "cssnano": "4.1.10",
     "element-resize-detector": "1.1.15",
@@ -124,8 +125,7 @@
     "testem": "2.17.0",
     "top-gh-contribs": "2.0.4",
     "validator": "7.2.0",
-    "walk-sync": "2.0.2",
-    "@tryghost/string": "^0.1.5"
+    "walk-sync": "2.0.2"
   },
   "ember-addon": {
     "paths": [
diff --git a/ghost/admin/renovate.json b/ghost/admin/renovate.json
index cc026b3420..8c81509ed2 100644
--- a/ghost/admin/renovate.json
+++ b/ghost/admin/renovate.json
@@ -7,7 +7,8 @@
     "ember-drag-drop",
     "normalize.css",
     "validator",
-    "ember-in-viewport"
+    "ember-in-viewport",
+    "codemirror"
   ],
   "ignorePaths": ["lib/koenig-editor/package.json"],
   "travis": { "enabled": true },
diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock
index 729fb4306f..64728ca4d6 100644
--- a/ghost/admin/yarn.lock
+++ b/ghost/admin/yarn.lock
@@ -3562,10 +3562,10 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codemirror@5.48.4:
-  version "5.48.4"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.48.4.tgz#4210fbe92be79a88f0eea348fab3ae78da85ce47"
-  integrity sha512-pUhZXDQ6qXSpWdwlgAwHEkd4imA0kf83hINmUEzJpmG80T/XLtDDEzZo8f6PQLuRCcUQhmzqqIo3ZPTRaWByRA==
+codemirror@5.48.2:
+  version "5.48.2"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.48.2.tgz#a9dd3d426dea4cd59efd59cd98e20a9152a30922"
+  integrity sha512-i9VsmC8AfA5ji6EDIZ+aoSe4vt9FcwPLdHB1k1ItFbVyuOFRrcfvnoKqwZlC7EVA2UmTRiNEypE4Uo7YvzVY8Q==
 
 coffeescript@~1.10.0:
   version "1.10.0"