From c32c74e34c825e30ae3f32b3043416bdd4731219 Mon Sep 17 00:00:00 2001 From: Han Qiao Date: Tue, 12 Aug 2025 21:18:24 +0800 Subject: [PATCH 001/128] fix: diff all schemas on branch merge (#37754) * fix: diff all schemas on branch merge * chore: remove branching limitation on schema and extensions * chore: remove limitation from blog post * chore: remove limitation from docs --- apps/docs/content/guides/deployment/branching/dashboard.mdx | 2 -- .../interfaces/App/FeaturePreview/Branching2Preview.tsx | 4 ---- apps/studio/data/branches/branch-merge-mutation.ts | 2 +- apps/www/_blog/2025-07-16-branching-2-0.mdx | 2 -- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/apps/docs/content/guides/deployment/branching/dashboard.mdx b/apps/docs/content/guides/deployment/branching/dashboard.mdx index 2d938165736..a7577014d5a 100644 --- a/apps/docs/content/guides/deployment/branching/dashboard.mdx +++ b/apps/docs/content/guides/deployment/branching/dashboard.mdx @@ -58,8 +58,6 @@ When reviewing a merge request you may see a notice at the top of the page askin There are a few limitations you should be aware of before deciding to use branching without git. - Custom roles created through the dashboard are not captured on branch creation -- Only public schema changes are supported right now -- Extensions are not included in the diff process - Branches can only be merged to main; merging between preview branches is not supported - If your branch is out of date, you can pull in latest changes from main, but keep in mind that all functions will be overwritten - Deleting functions must be done manually on main branch diff --git a/apps/studio/components/interfaces/App/FeaturePreview/Branching2Preview.tsx b/apps/studio/components/interfaces/App/FeaturePreview/Branching2Preview.tsx index 6aba6698b34..9bf5f6d30c1 100644 --- a/apps/studio/components/interfaces/App/FeaturePreview/Branching2Preview.tsx +++ b/apps/studio/components/interfaces/App/FeaturePreview/Branching2Preview.tsx @@ -25,10 +25,6 @@ export const Branching2Preview = () => {

Limitations: