Skip to content

chore(webapp): enable dev branches for everyone #4106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carderne merged 1 commit into from
Jul 2, 2026
Merged

chore(webapp): enable dev branches for everyone #4106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions apps/webapp/app/components/navigation/EnvironmentSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<Popover onOpenChange={(open) => setIsMenuOpen(open)} open={isMenuOpen}>
<SimpleTooltip
Expand Down Expand Up @@ -115,11 +113,7 @@ export function EnvironmentSelector({
{project.environments
.filter((env) => 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(
Expand Down
3 changes: 0 additions & 3 deletions apps/webapp/app/v3/featureFlags.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export const FEATURE_FLAG = {
computeMigrationFreePercentage: "computeMigrationFreePercentage",
computeMigrationPaidPercentage: "computeMigrationPaidPercentage",
computeMigrationRequireTemplate: "computeMigrationRequireTemplate",
devBranchesEnabled: "devBranchesEnabled",
} as const;

export const FeatureFlagCatalog = {
Expand Down Expand Up @@ -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;
Expand Down