From f88a05df405dda9c67eb21a12e284fe044e16488 Mon Sep 17 00:00:00 2001
From: Stephen Cefali <steve@pioneerdev.ai>
Date: Fri, 30 Aug 2024 03:40:54 +0800
Subject: [PATCH] feat(releases): allow resolving in an upcoming release ui
 (#76377)

---
 static/app/components/actions/resolve.spec.tsx | 4 +---
 static/app/components/actions/resolve.tsx      | 5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/static/app/components/actions/resolve.spec.tsx b/static/app/components/actions/resolve.spec.tsx
index dd6488109dce73..1c3460f341976c 100644
--- a/static/app/components/actions/resolve.spec.tsx
+++ b/static/app/components/actions/resolve.spec.tsx
@@ -247,9 +247,7 @@ describe('ResolveActions', function () {
   });
 
   it('does render in upcoming release', async function () {
-    const organization = OrganizationFixture({
-      features: ['resolve-in-upcoming-release'],
-    });
+    const organization = OrganizationFixture({});
     const onUpdate = jest.fn();
     MockApiClient.addMockResponse({
       url: '/projects/org-slug/project-slug/releases/',
diff --git a/static/app/components/actions/resolve.tsx b/static/app/components/actions/resolve.tsx
index 156a9442f578bd..783b1064ff3c41 100644
--- a/static/app/components/actions/resolve.tsx
+++ b/static/app/components/actions/resolve.tsx
@@ -206,10 +206,6 @@ function ResolveActions({
       });
     };
 
-    const hasUpcomingRelease = organization.features.includes(
-      'resolve-in-upcoming-release'
-    );
-
     const isSemver = latestRelease ? isSemverRelease(latestRelease.version) : false;
     const items: MenuItemProps[] = [
       {
@@ -219,7 +215,6 @@ function ResolveActions({
           ? actionTitle
           : t('The next release that is not yet released'),
         onAction: () => onActionOrConfirm(handleUpcomingReleaseResolution),
-        hidden: !hasUpcomingRelease,
       },
       {
         key: 'next-release',