File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -58,8 +58,6 @@ export function EnvironmentSelector({
5858 } , [ navigation . location ?. pathname ] ) ;
5959
6060 const hasStaging = project . environments . some ( ( env ) => env . type === "STAGING" ) ;
61- const devBranchesEnabled = Boolean ( organization . featureFlags ?. devBranchesEnabled ) ;
62-
6361 return (
6462 < Popover onOpenChange = { ( open ) => setIsMenuOpen ( open ) } open = { isMenuOpen } >
6563 < SimpleTooltip
@@ -115,11 +113,7 @@ export function EnvironmentSelector({
115113 { project . environments
116114 . filter ( ( env ) => env . parentEnvironmentId === null )
117115 . map ( ( env ) => {
118- // DEVELOPMENT is only branchable in the UI when the org has the
119- // multi-branch dev flag on. Without it, dev renders as a plain
120- // selector button (the original behavior). PREVIEW is unaffected.
121- const renderAsBranchable =
122- isBranchableEnvironment ( env ) && ( env . type !== "DEVELOPMENT" || devBranchesEnabled ) ;
116+ const renderAsBranchable = isBranchableEnvironment ( env ) ;
123117
124118 if ( renderAsBranchable ) {
125119 const branchEnvironments = project . environments . filter (
Original file line number Diff line number Diff line change @@ -17,7 +17,6 @@ export const FEATURE_FLAG = {
1717 computeMigrationFreePercentage : "computeMigrationFreePercentage" ,
1818 computeMigrationPaidPercentage : "computeMigrationPaidPercentage" ,
1919 computeMigrationRequireTemplate : "computeMigrationRequireTemplate" ,
20- devBranchesEnabled : "devBranchesEnabled" ,
2120} as const ;
2221
2322export const FeatureFlagCatalog = {
@@ -48,8 +47,6 @@ export const FeatureFlagCatalog = {
4847 // When on, migrated orgs build their compute template in required mode at deploy
4948 // (fails the deploy on error) instead of shadow. Strict boolean (see above).
5049 [ FEATURE_FLAG . computeMigrationRequireTemplate ] : z . boolean ( ) ,
51- // Per-org access to development branches. Off unless enabled for the org.
52- [ FEATURE_FLAG . devBranchesEnabled ] : z . coerce . boolean ( ) ,
5350} ;
5451
5552export type FeatureFlagKey = keyof typeof FeatureFlagCatalog ;
You can’t perform that action at this time.
0 commit comments