diff --git a/apps/webapp/app/components/navigation/EnvironmentSelector.tsx b/apps/webapp/app/components/navigation/EnvironmentSelector.tsx index 40174acfe07..58c3aae5a0a 100644 --- a/apps/webapp/app/components/navigation/EnvironmentSelector.tsx +++ b/apps/webapp/app/components/navigation/EnvironmentSelector.tsx @@ -58,8 +58,6 @@ export function EnvironmentSelector({ }, [navigation.location?.pathname]); const hasStaging = project.environments.some((env) => env.type === "STAGING"); - const devBranchesEnabled = Boolean(organization.featureFlags?.devBranchesEnabled); - return ( setIsMenuOpen(open)} open={isMenuOpen}> env.parentEnvironmentId === null) .map((env) => { - // DEVELOPMENT is only branchable in the UI when the org has the - // multi-branch dev flag on. Without it, dev renders as a plain - // selector button (the original behavior). PREVIEW is unaffected. - const renderAsBranchable = - isBranchableEnvironment(env) && (env.type !== "DEVELOPMENT" || devBranchesEnabled); + const renderAsBranchable = isBranchableEnvironment(env); if (renderAsBranchable) { const branchEnvironments = project.environments.filter( diff --git a/apps/webapp/app/v3/featureFlags.ts b/apps/webapp/app/v3/featureFlags.ts index 31fe3792f3e..46434bebf30 100644 --- a/apps/webapp/app/v3/featureFlags.ts +++ b/apps/webapp/app/v3/featureFlags.ts @@ -17,7 +17,6 @@ export const FEATURE_FLAG = { computeMigrationFreePercentage: "computeMigrationFreePercentage", computeMigrationPaidPercentage: "computeMigrationPaidPercentage", computeMigrationRequireTemplate: "computeMigrationRequireTemplate", - devBranchesEnabled: "devBranchesEnabled", } as const; export const FeatureFlagCatalog = { @@ -48,8 +47,6 @@ export const FeatureFlagCatalog = { // When on, migrated orgs build their compute template in required mode at deploy // (fails the deploy on error) instead of shadow. Strict boolean (see above). [FEATURE_FLAG.computeMigrationRequireTemplate]: z.boolean(), - // Per-org access to development branches. Off unless enabled for the org. - [FEATURE_FLAG.devBranchesEnabled]: z.coerce.boolean(), }; export type FeatureFlagKey = keyof typeof FeatureFlagCatalog;