Skip to content

[pull] master from supabase:master#723

Merged
pull[bot] merged 8 commits intocode:masterfrom
supabase:master
Mar 3, 2026
Merged

[pull] master from supabase:master#723
pull[bot] merged 8 commits intocode:masterfrom
supabase:master

Conversation

@pull
Copy link

@pull pull bot commented Mar 3, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

aantti and others added 8 commits March 3, 2026 17:33
## I have read the
[CONTRIBUTING.md](https://github.com/supabase/supabase/blob/master/CONTRIBUTING.md)
file.

YES

## What kind of change does this PR introduce?

- Add two new how-to guides covering OAuth and OTP/MFA configuration for
[self-hosted Supabase](https://supabase.com/docs/guides/self-hosting)
- Add placeholder environment variables to `.env.example` and
`docker-compose.yml`

---------

Co-authored-by: Chris Chinchilla <chris@chrischinchilla.com>
Co-authored-by: Chris Chinchilla <chris.ward@supabase.io>
### Changes
- Replace `isFreePlan` with entitlement-based check in infrastructure
warnings: `CPUWarnings`, `RAMWarnings`, and `DiskIOBandwidthWarnings`
previously derived their button label ("Upgrade project" vs "Change
compute add-on") from checking the org's plan. This is now driven by the
`instances.compute_update_available_sizes` entitlement.
## I have read the
[CONTRIBUTING.md](https://github.com/supabase/supabase/blob/master/CONTRIBUTING.md)
file.

YES

## What kind of change does this PR introduce?

- Add a new how-to guide covering PR #43291
- Explain how to use an https proxy on top of [self-hosted
Supabase](https://supabase.com/docs/guides/self-hosting) API gateway
(Kong)

---------

Co-authored-by: Chris Chinchilla <chris.ward@supabase.io>
Adds the entitlement check to invite new members through SSO in the Team
management page

### Testing
- Head to `/org/_/team` with an Org on the Free or Pro plan
- Click on `Invite members`
- Assert that you're shown the upgrade prompt 

<img width="896" height="464" alt="image"
src="https://github.com/user-attachments/assets/8cc152a9-d25f-48a0-b1a7-e19c6b88b16e"
/>

- Head to `/org/_/team` with an Org on the Team Plan
- Click on `Invite members`
- Assert that SSO is shown as available
<img width="652" height="463" alt="image"
src="https://github.com/user-attachments/assets/e35e6f20-3c24-41b5-a56e-3ca44ee31877"
/>
Adds the entitlement check for organization MFA.

### Testing 
- With an Org on the Free Plan, head to `/org/_/security`
- Assert that the upgrade prompt is shown:

<img width="1271" height="309" alt="image"
src="https://github.com/user-attachments/assets/5d2ce291-ba95-44dd-864f-9ba2732b0752"
/>

- With an Org on the Pro Plan or above, head to `/org/_/security`
- Assert that you can enable MFA:
<img width="1271" height="309" alt="image"
src="https://github.com/user-attachments/assets/5713964b-730d-4bed-b8bf-2ac59976dfc5"
/>
Adds entitlements check to the `DiskSizeConfiguration` and
`DiskSizeConfigurationModal` components

## Testing

### Database Settings
- You'll need an Org in the Pro Plan with spend cap disabled, and a
Project with Fly as the cloud provider.
- Head to `/project/_/database/settings`
- Assert that the Disk Size configuration section is visible:
<img width="707" height="459" alt="image"
src="https://github.com/user-attachments/assets/ce98ed20-cab7-44db-a118-b84d9f9f935c"
/>

- With a Free Project with Fly as the cloud provider, assert that the
Disk Size configuration is gated:
<img width="707" height="260" alt="image"
src="https://github.com/user-attachments/assets/23374b03-7981-42cd-b928-0e8808d128b1"
/>


### Observability > Database

- You'll need an Org in the Pro Plan with spend cap disabled, and a
Project with Fly as the cloud provider.
- Head to `project/_/observability/database`, and scroll to the
`Database Size` section
- Assert that clicking the `Increase disk size` button shows this modal:
<img width="829" height="469" alt="image"
src="https://github.com/user-attachments/assets/ae121e3f-a68b-4de6-803d-aff8462e0c7c"
/>

- With a Free Project with Fly as the cloud provider, assert that the
increase size modal doesn't allow you to increase the size
<img width="707" height="398" alt="image"
src="https://github.com/user-attachments/assets/3e97ce27-4ecd-4152-80a0-d5e0d141f44b"
/>
This PR adds the entitlement check for configuring auth user sessions.

### Testing
- Head to `/project/_/auth/sessions` with an org on the Free Plan 
- Assert that the upgrade prompt is shown and that u:
<img width="1203" height="449" alt="image"
src="https://github.com/user-attachments/assets/44aa1b64-e06b-491e-8d30-587cfe1ff65e"
/>


- Head to `/project/_/auth/sessions` with an org on the Pro Plan or
above
- Assert that you're able to configure the User Sessions section
<img width="1203" height="381" alt="image"
src="https://github.com/user-attachments/assets/b566dc49-6367-41cc-98fe-25d5e7bdaf87"
/>
This PR adds the entitlement check for configuring auth user sessions.

### Testing
- Head to `/project/_/auth/sessions` with an org on the Free Plan 
- Assert that the upgrade prompt is shown and that u:
<img width="1203" height="449" alt="image"
src="https://github.com/user-attachments/assets/44aa1b64-e06b-491e-8d30-587cfe1ff65e"
/>


- Head to `/project/_/auth/sessions` with an org on the Pro Plan or
above
- Assert that you're able to configure the User Sessions section
<img width="1203" height="381" alt="image"
src="https://github.com/user-attachments/assets/b566dc49-6367-41cc-98fe-25d5e7bdaf87"
/>
@pull pull bot locked and limited conversation to collaborators Mar 3, 2026
@pull pull bot added the ⤵️ pull label Mar 3, 2026
@pull pull bot merged commit 2306898 into code:master Mar 3, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants