From 05330316e3768d21657cafc8d8ca0292e40b1def Mon Sep 17 00:00:00 2001
From: Rishabh Garg <rish@ghost.org>
Date: Fri, 21 Oct 2022 19:38:57 +0530
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Allowed=20fixing=20newsletter=20lin?=
 =?UTF-8?q?ks=20(#15672)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs https://github.com/TryGhost/Team/issues/2116

- allows site owners to edit a link in a post that has already been sent out, fixing any typos or other mistakes
- resets click counter for the edited link back to 0 so site owners can see the clicks on new link, doesn't change the overall click count
---
 ghost/admin/app/templates/settings/labs.hbs         | 13 -------------
 ghost/core/core/shared/labs.js                      |  6 +++---
 .../admin/__snapshots__/settings.test.js.snap       |  2 +-
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index 5264fadb526..248803e1abf 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -284,19 +284,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Fix newsletter links</h4>
-                            <p class="gh-expandable-description">
-                               Allow publishers to edit newsletter links after sending.
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                           <GhFeatureFlag @flag="fixNewsletterLinks" />
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
         {{/if}}
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index 7464068269a..02ce9685a26 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -19,7 +19,8 @@ const GA_FEATURES = [
     'freeTrial',
     'compExpiring',
     'searchHelper',
-    'emailAlerts'
+    'emailAlerts',
+    'fixNewsletterLinks'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
@@ -35,8 +36,7 @@ const ALPHA_FEATURES = [
     'beforeAfterCard',
     'lexicalEditor',
     'exploreApp',
-    'audienceFeedback',
-    'fixNewsletterLinks'
+    'audienceFeedback'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
index 65ba2ea2fa1..e1393b18984 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
@@ -627,7 +627,7 @@ exports[`Settings API Edit Can edit a setting 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "3450",
+  "content-length": "3478",
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Accept-Version, Origin, Accept-Encoding",