[pull] master from supabase:master

apps/docs/content/_partials/social_provider_setup.mdx

@@ -7,6 +7,17 @@ The next step requires a callback URL, which looks like this: `https://<project-
 
 <Admonition type="note">
 
+#### Local development
+
+When testing OAuth locally with the Supabase CLI, ensure your OAuth provider
+is configured with the local Supabase Auth callback URL:
+
+http://localhost:54321/auth/v1/callback
+
+If this callback URL is missing or misconfigured, OAuth sign-in may fail or not redirect correctly during local development.
+
+See the [local development docs](/docs/guides/local-development) for more details.
+
 For testing OAuth locally with the Supabase CLI see the [local development docs](/docs/guides/local-development).
 
 </Admonition>

apps/docs/content/guides/auth/social-login/auth-azure.mdx

@@ -31,6 +31,19 @@ Setting up OAuth with Azure consists of four broad steps:
 
 ## Obtain a client ID and secret
 
+### Local development with Azure OAuth
+
+Azure does not allow `127.0.0.1` as a redirect URI hostname and requires
+the use of `localhost`.
+
+To enable Azure OAuth during local Supabase development, configure the
+Supabase API external URL in your `config.toml`:
+
+```toml
+[api]
+external_url = "http://localhost:54321"
+```
+
 - Once your app has been registered, the client ID can be found under the [list of app registrations](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredApps) under the column titled _Application (client) ID_.
 - You can also find it in the app overview screen.
 - Place the Client ID in the Azure configuration screen in the Supabase Auth dashboard.

apps/docs/content/guides/auth/social-login/auth-google.mdx

@@ -67,7 +67,7 @@ Regardless of whether you use application code or Google's pre-built solutions t
    - Add `http://localhost:<port>` while developing locally. Remember to remove this when your application [goes into production](/docs/guides/deployment/going-into-prod).
 1. Under **Authorized redirect URIs** add your Supabase project's callback URL.
    - Access it from the [Google provider page on the Dashboard](/dashboard/project/_/auth/providers?provider=Google).
-   - For local development, use `http://localhost:3000/auth/v1/callback`.
+   - For local development, use `http://127.0.0.1:54321/auth/v1/callback`.
 1. Click `Create` and make sure you save the Client ID and Client Secret.
    - Add these values to the [Google provider page on the Dashboard](/dashboard/project/_/auth/providers?provider=Google).
 

apps/docs/content/guides/storage/debugging/logs.mdx

@@ -5,9 +5,17 @@ description: 'Learn how to check Storage Logs'
 sidebar_label: 'Debugging'
 ---
 
-Accessing the [Storage Logs](/dashboard/project/__/logs/explorer?q=select+id%2C+storage_logs.timestamp%2C+event_message+from+storage_logs%0A++%0A++order+by+timestamp+desc%0A++limit+100%0A++) allows you to examine all incoming request logs to your Storage service. You can also filter logs and delve into specific aspects of your requests.
+The [Storage Logs](/dashboard/project/_/logs/storage-logs) provide a convenient way to examine all incoming request logs to your Storage service. You can filter by time and keyword searches.
 
-### Common log queries
+For more advanced filtering needs, use the [Logs Explorer](/dashboard/project/_/logs/explorer) to query the Storage logs dataset directly. The Logs Explorer is separate from the SQL Editor and uses a subset of the BigQuery SQL syntax rather than traditional SQL.
+
+<Admonition type="tip">
+
+For more details on filtering the log tables, see [Advanced Log Filtering](/docs/guides/telemetry/advanced-log-filtering)
+
+</Admonition>
+
+### Example Storage queries for the Logs Explorer
 
 #### Filter by status 5XX error
 

apps/docs/content/troubleshooting/keeping-free-projects-after-pro-upgrade-Kf9Xm2.mdx

@@ -0,0 +1,28 @@
+---
+title = "Keeping your 2 Free projects after upgrading to Pro"
+date_created = "2026-01-23T00:00:00+00:00"
+topics = [ "platform" ]
+keywords = [ "free tier", "pro plan", "billing", "organizations", "project transfer" ]
+---
+
+## Can you keep your 2 free projects after upgrading to pro?
+
+Yes! You still get 2 free projects after you upgrade to Pro. They just need to be in a **separate** Free Plan organization.
+
+## Why do free projects need to be in a separate organization?
+
+Because billing is managed at the organization level, not the project level. We need to keep Free tier usage separate from Pro tier usage for accurate billing and cost transparency.
+
+To keep both free projects and Pro organization:
+Create a new Free Plan organization (or use an existing free organization if you have one)
+
+- Go to the [Dashboard](/dashboard)
+- Click on the organization dropdown
+- Select "New organization" (or visit [https://supabase.com/dashboard/new](/dashboard/new))
+- Create a new organization on the default Free Plan
+
+## Additional resources
+
+- [Organization-based billing](/docs/guides/platform/billing-on-supabase#organization-based-billing)
+- [Project transfer guide](/docs/guides/platform/project-transfer)
+- [Billing FAQ](/docs/guides/platform/billing-faq)