From 968380132b07396f115794a362fd9991b6331dcf Mon Sep 17 00:00:00 2001
From: Rishabh <zrishabhgarg@gmail.com>
Date: Wed, 24 Aug 2022 18:26:58 +0530
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Allowed=20setting=20expiry=20for=20?=
 =?UTF-8?q?complimentary=20subscriptions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes https://github.com/TryGhost/Team/issues/1727

- allows site owners to give cardless free trials to members by setting expiry on complimentary subscriptions
- also allows complimentary members to upgrade as paid member
---
 ghost/admin/app/templates/settings/labs.hbs | 13 -------------
 ghost/core/core/shared/labs.js              |  6 +++---
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index 25dca40ba1..b00a152ba8 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -226,19 +226,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Cardless trials</h4>
-                            <p class="gh-expandable-description">
-                               Add support for expiring complimentary subscriptions
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                           <GhFeatureFlag @flag="compExpiring" />
-                        </div>
-                    </div>
-                </div>
                 <div class="gh-expandable-block">
                     <div class="gh-expandable-header">
                         <div>
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index 2dd9440f63..ac35cefba6 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -16,7 +16,8 @@ const messages = {
 // flags in this list always return `true`, allows quick global enable prior to full flag removal
 const GA_FEATURES = [
     'newsletterPaywall',
-    'freeTrial'
+    'freeTrial',
+    'compExpiring'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
@@ -30,8 +31,7 @@ const ALPHA_FEATURES = [
     'urlCache',
     'beforeAfterCard',
     'memberAttribution',
-    'searchHelper',
-    'compExpiring'
+    'searchHelper'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];