From 29e214a465139edbb9bc40330a83ae174e33f6ed Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Tue, 15 May 2018 13:20:40 +0100
Subject: [PATCH] Koenig - Remove developer experiments flag requirement

refs https://github.com/TryGhost/Ghost/issues/9505
- remove requirement for the `enableDeveloperExperiments` flag to be able to use Koenig
- it's now possible to enable as a standard Labs beta feature
---
 core/client                        | 2 +-
 core/server/models/post.js         | 3 +--
 core/test/unit/models/post_spec.js | 4 ----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/core/client b/core/client
index dd3518471dd..5f92a9b8865 160000
--- a/core/client
+++ b/core/client
@@ -1 +1 @@
-Subproject commit dd3518471ddaba4dd532706c1a148a4a88d17480
+Subproject commit 5f92a9b88657b30636af8f5c390fc32d5b067983
diff --git a/core/server/models/post.js b/core/server/models/post.js
index 8c7b84aa76e..4c3623b5828 100644
--- a/core/server/models/post.js
+++ b/core/server/models/post.js
@@ -256,7 +256,6 @@ Post = ghostBookshelf.Model.extend({
         // TODO: re-render all content and remove the version toggle for Ghost 2.0
         if (mobiledoc) {
             let version = 1;
-            let devExperimentsEnabled = config.get('enableDeveloperExperiments');
             let koenigEnabled = labs.isSet('koenigEditor') === true;
 
             let mobiledocIsCompatibleWithV1 = function mobiledocIsCompatibleWithV1(doc) {
@@ -275,7 +274,7 @@ Post = ghostBookshelf.Model.extend({
                 return false;
             };
 
-            if ((devExperimentsEnabled && koenigEnabled) || !mobiledocIsCompatibleWithV1(mobiledoc)) {
+            if (koenigEnabled || !mobiledocIsCompatibleWithV1(mobiledoc)) {
                 version = 2;
             }
 
diff --git a/core/test/unit/models/post_spec.js b/core/test/unit/models/post_spec.js
index 3a39af21d31..e29801c62ad 100644
--- a/core/test/unit/models/post_spec.js
+++ b/core/test/unit/models/post_spec.js
@@ -1891,7 +1891,6 @@ describe('Unit: models/post', function () {
     });
 
     describe('Mobiledoc conversion', function () {
-        let configUtils = require('../../utils/configUtils');
         let labs = require('../../../server/services/labs');
         let origLabs = _.cloneDeep(labs);
         let events;
@@ -1906,10 +1905,7 @@ describe('Unit: models/post', function () {
             });
         });
 
-        afterEach(configUtils.restore);
-
         it('uses v2 if Koenig is enabled', function () {
-            configUtils.set('enableDeveloperExperiments', true);
             sandbox.stub(labs, 'isSet').callsFake(function (key) {
                 if (key === 'koenigEditor') {
                     return true;