Merge branch 'main' into user/side-editor-preview-beta

Author: meganelacheny

.github/workflows/block-labeled-prs.yml

@@ -3,6 +3,13 @@ name: Block PRs with specific labels
 on:
   pull_request:
     types: [opened, labeled, unlabeled, synchronize]
+    branches:
+      - main
+      - next
+  push:
+    branches:
+      - main
+      - next
 
 jobs:
   check-labels:
@@ -14,21 +21,29 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
+            // Define blocking labels
             const blockingLabels = ["flag: don't merge", "flag: merge pending release"];
-            const { data: labels } = await github.rest.issues.listLabelsOnIssue({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number
-            });
             
-            const labelNames = labels.map(label => label.name);
-            const blockedLabels = labelNames.filter(label => 
-              blockingLabels.includes(label.toLowerCase())
-            );
-            
-            if (blockedLabels.length > 0) {
-              core.setFailed(`PR cannot be merged because it has the following blocking labels: ${blockedLabels.join(', ')}`);
-              return;
-            }
-            
-            console.log('No blocking labels found, PR can be merged');
+            // Check if this is a pull request event
+            if (context.payload.pull_request) {
+              const { data: labels } = await github.rest.issues.listLabelsOnIssue({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number
+              });
+              
+              const labelNames = labels.map(label => label.name);
+              const blockedLabels = labelNames.filter(label => 
+                blockingLabels.includes(label.toLowerCase())
+              );
+              
+              if (blockedLabels.length > 0) {
+                core.setFailed(`PR cannot be merged because it has the following blocking labels: ${blockedLabels.join(', ')}`);
+                return;
+              }
+              
+              console.log('No blocking labels found, PR can be merged');
+            } else {
+              // If this is a direct push, allow it to pass without checking
+              console.log('This is a direct push event, not a PR. Skipping label check.');
+            }

docusaurus/docs/cloud/getting-started/cloud-fundamentals.md

@@ -14,10 +14,10 @@ Before going any further into this Strapi Cloud documentation, we recommend you
 
 - **Hosting Platform** <br/> Strapi Cloud is a hosting platform that allows to deploy already existing Strapi projects created with Strapi CMS (Content Management System). Strapi Cloud is *not* the SaaS (Software as a Service) version of Strapi CMS. Feel free to refer to the [Developer Documentation](https://docs.strapi.io/dev-docs/intro) and [User Guide](https://docs.strapi.io/user-docs/intro) to learn more about Strapi CMS.
 
-- **Strapi Cloud Pricing Plans** <br/> As a Strapi Cloud user you have the choice between 3 tiers: Developer, Pro and Team. Depending on the tier, you have access to different functionalities, support and customization options (see [Pricing page](https://strapi.io/pricing-cloud) for more details). In this Strapi Cloud documentation, the <CloudDevBadge />, <CloudProBadge />, and <CloudTeamBadge /> badges can be displayed below a section's title to indicate for which tier the feature is available.
+- **Strapi Cloud Pricing Plans** <br/> As a Strapi Cloud user you have the choice between 3 tiers: Essential, Pro and Scale. Depending on the tier, you have access to different functionalities, support and customization options (see [Pricing page](https://strapi.io/pricing-cloud) for more details). In this Strapi Cloud documentation, the <CloudEssentialBadge />, <CloudProBadge />, and <CloudScaleBadge /> badges can be displayed below a section's title to indicate for which tier the feature is available.
 
 - **Strapi CMS features** <br/> The Strapi Cloud plans include some Strapi CMS features (see [Pricing page](https://strapi.io/pricing-cloud) for more details). These features, highlighted with a <GrowthBadge /> or an <EnterpriseBadge /> badge, are documented in the [User Guide](https://docs.strapi.io/user-docs/intro) and the [Developer Documentation](https://docs.strapi.io/dev-docs/intro).
 
 - **Types of Strapi Cloud users** <br/> There can be 2 types of users on a Strapi Cloud project: owners and maintainers. The owner is the one who has created the project and has therefore access to all features and options for the project. Maintainers are users who have been invited to contribute to an already created project by its owner. Maintainers, as documented in the [Collaboration](/cloud/projects/collaboration) page, cannot view and access all features and options from the Strapi Cloud dashboard.
 
-- **Support** <br/> The level of support provided by the Strapi Support team depends on the Strapi Cloud tier you subscribed for. The Developer and Pro tiers include Basic support while the Team tier includes Standard support. Please refer to the [dedicated support article](https://support.strapi.io/support/solutions/articles/67000680833-what-is-supported-by-the-strapi-team#Not-Supported) for all details regarding support levels.
+- **Support** <br/> The level of support provided by the Strapi Support team depends on the Strapi Cloud tier you subscribed for. The Essential and Pro tiers include Basic support while the Scale tier includes Standard support. Please refer to the [dedicated support article](https://support.strapi.io/support/solutions/articles/67000680833-what-is-supported-by-the-strapi-team#Not-Supported) for all details regarding support levels.

docusaurus/docs/cloud/getting-started/deployment.md

@@ -60,12 +60,12 @@ Before you can deploy your Strapi application on Strapi Cloud using the Cloud da
     <ThemedImage
     alt="Strapi Cloud project creation, step 1"
     sources={{
-        light: '/img/assets/cloud/project-creation-1.1.png',
-        dark: '/img/assets/cloud/project-creation-1.1_DARK.png',
+        light: '/img/assets/cloud/project-creation-1.png',
+        dark: '/img/assets/cloud/project-creation-1_DARK.png',
     }}
     />
 
-3. Choose a plan for your Strapi Cloud project: either Developer, Pro, Team, or the 14-days free trial. Feel free to refer to [Pricing](https://strapi.io/pricing-cloud) for more information.
+3. Choose a plan for your Strapi Cloud project: either Essential, Pro, Scale, or the 14-days free trial. Feel free to refer to [Pricing](https://strapi.io/pricing-cloud) for more information.
 
     :::note Notes
     - Strapi Cloud offers a free trial for only one project and you will not need to share your credit card details to deploy your first project. Once the free trial has already been used for a previous project, the option will no longer appear in the plan selection.

docusaurus/docs/cloud/getting-started/usage-billing.md

@@ -15,63 +15,36 @@ tags:
 
 This page contains general information related to the usage and billing of your Strapi Cloud account and projects.
 
-Strapi Cloud offers a free 14 days trial for all new accounts, and 3 paid plans: Developer, Pro and Team (see [Pricing page](https://strapi.io/pricing-cloud)). The table below summarises Strapi Cloud usage-based pricing tiers, for general features & usage, CMS features and Cloud specific features:
+Strapi Cloud offers a free 14 days trial for all new accounts, and 3 paid plans: Essential, Pro and Scale (see [Pricing page](https://strapi.io/pricing-cloud)). The table below summarises Strapi Cloud usage-based pricing tiers, for general features & usage and Cloud specific features:
 
-| Feature | Free Trial | Developer | Pro | Team |
+| Feature | Free Trial | Essential | Pro | Scale |
 | --- | --- | --- | --- | --- |
-| **Seats** | 10  | 1 (up to 2 extra) | 5 (up to 15 extra) | 10 (up to 40 extra) |
-| **Database Entries**  | 1,000 | 1,000 | 100,000 | 1,000,000 |
-| **Assets Storage** | 5GB | 15GB | 150GB | 500GB |
-| **Assets Bandwidth** | 50GB | 50GB per month | 500GB per month | 1,000GB per month |
+| **Database Entries**  | 2,500 | Unlimited* | Unlimited* | Unlimited* |
+| **Assets Storage** | 25GB | 50GB | 250GB | 1000GB |
+| **Assets Bandwidth (per month)** | 25GB | 50GB | 500GB | 1,000GB |
 | **API Requests** | 10,000 | 100,000 | 1,000,000 | 10,000,000 |
 |  |  |  |  |  |
-| **Audit Logs** | 7 days retention | N/A | N/A | 7 days retention |
-| **Releases** | 3 pending releases | N/A | N/A | 3 pending releases |
-| **Review Workflows** | up to 2 | N/A | N/A | up to 2 |
-| **Content History** | 14 days retention | N/A | 14 days retention | 90 days retention |
-|  |  |  |  |  |
 | **Backups** | N/A | N/A | Weekly | Daily |
 | **Environments** | N/A | N/A | 0 included (up to 99 extra) | 1 included (up to 99 extra) |
+| **Emails (per month)** | 100 | Unlimited* | Unlimited* | Unlimited* |
 
 :::strapi Additional information on usage and features
 - General features & usage:
-  - Seats are the maximum number of users that can access the Strapi admin panel.
   - Database entries are the number of entries in your database.
   - Assets storage is the amount of storage used by your assets.
   - Assets bandwidth is the amount of bandwidth used by your assets.
   - API requests are the number of requests made to your APIs. This includes requests to the GraphQL and REST APIs, excluding requests for file and media assets counted towards CDN bandwidth and storage.
-- CMS features:
-  - Audit Logs refers to the maximum number of days for which the feature retains the activities that happened (see [Audit Logs in User Guide](/user-docs/settings/audit-logs) for more information).
-  - Releases refers to the maximum number of pending releases that can be created (see [Releases in User Guide](/user-docs/releases/introduction) for more information).
-  - Review Workflows refers to the maximum number of workflows that can be created and used (see [Review Workflows in User Guide](/user-docs/settings/review-workflows) for more information).
-  - Content History refers to the maximum numbers of days kept in history (see [Content History in User Guide](/user-docs/content-manager/working-with-content-history))
 - Cloud specific feature:
   - Backups refers to the automatic backups of Strapi Cloud projects (see [Backups documentation](/cloud/projects/settings#backups) for more information on the feature).
   - Environments refers to the number of environments included in the plan on top of the default production environment (see [Environments](/cloud/projects/settings#environments) documentation for more information on the feature).
 :::
 
 ## Environments management
 
-Environments are isolated instances of your Strapi Cloud project. All projects have a default production environment, but other additional environments can be configured for projects on a Pro or Team plan, from the *Environments* tab of a project's settings (see [Environments](/cloud/projects/settings#environments)). There is no limit to the number of additional environments that can be configured for a Strapi Cloud project.
+Environments are isolated instances of your Strapi Cloud project. All projects have a default production environment, but other additional environments can be configured for projects on a Pro or Scale plan, from the *Environments* tab of a project's settings (see [Environments](/cloud/projects/settings#environments)). There is no limit to the number of additional environments that can be configured for a Strapi Cloud project.
 
 The usage limits of additional environments are the same as for the project's production environment (e.g. an additional environment on the Pro plan will be limited at 150GB for assets storage, and overages will be charged the same way as for the production environment). Note however that the assets bandwidth and API calls are project-based, not environment-based, so these usage limits do not change even with additional environments.
 
-## Seats management
-
-Seats represent the maximum number of users that can access the Strapi admin panel. Each plan comes with a default number of seats. 
-
-You can add more seats either by upgrading to a higher plan, or manually adding individual seats as desired. Seats can be added from the <Icon name="credit-card" /> *Billing & Usage* tab of a project's settings (see [Managing project's number of seats](/cloud/projects/settings#managing-projects-number-of-seats)).
-
-There is however a maximum number of seats that can be added per plan:
-
-| Plan | Maximum Seats |
-| --- | --- |
-| **Free Trial** | 10 |
-| **Developer** | 3 |
-| **Pro** | 20 |
-| **Team** | 50 |
-
- 
 ## Billing
 
 Billing is based on the usage of your Strapi Cloud account and projects. You will be billed monthly for the usage of your account and applications. You can view your usage and billing information in the [Billing](https://cloud.strapi.io/profile/billing) section of your Strapi Cloud account.