Commit 8fb16ff9 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'eread/raise-substitutions-rule-to-error' into 'master'

Raise substitutions rule to error and fix breaks

See merge request gitlab-org/gitlab!27152
parents d45c4f52 c0ea363a
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
# #
# For a list of all options, see https://errata-ai.github.io/vale/styles/ # For a list of all options, see https://errata-ai.github.io/vale/styles/
extends: substitution extends: substitution
message: Use `%s` instead of `%s`. message: Use "%s" instead of "%s".
link: https://about.gitlab.com/handbook/communication/#top-misused-terms link: https://about.gitlab.com/handbook/communication/#top-misused-terms
level: warning level: error
nonword: true
ignorecase: true ignorecase: true
swap: swap:
GitLabber: GitLab team member GitLabber: GitLab team member
......
...@@ -98,9 +98,9 @@ If a new subscription would cause the total number of subscription to exceed the ...@@ -98,9 +98,9 @@ If a new subscription would cause the total number of subscription to exceed the
limit, the subscription will be considered invalid. limit, the subscription will be considered invalid.
- On GitLab.com different [limits are defined per plan](../user/gitlab_com/index.md#gitlab-cicd) and they affect all projects under that plan. - On GitLab.com different [limits are defined per plan](../user/gitlab_com/index.md#gitlab-cicd) and they affect all projects under that plan.
- On [GitLab Starter](https://about.gitlab.com/pricing/#self-managed) tier or higher self-hosted installations, this limit is defined for the `default` plan that affects all projects. - On [GitLab Starter](https://about.gitlab.com/pricing/#self-managed) tier or higher self-managed installations, this limit is defined for the `default` plan that affects all projects.
To set this limit on a self-hosted installation, run the following in the To set this limit on a self-managed installation, run the following in the
[GitLab Rails console](https://docs.gitlab.com/omnibus/maintenance/#starting-a-rails-console-session): [GitLab Rails console](https://docs.gitlab.com/omnibus/maintenance/#starting-a-rails-console-session):
```ruby ```ruby
......
...@@ -112,17 +112,15 @@ end ...@@ -112,17 +112,15 @@ end
### Subscription Plans ### Subscription Plans
Self-hosted: Self-managed:
- `default` - Everyone - `default` - Everyone
Hosted: GitLab.com:
- `free` - Everyone - `free` - Everyone
- `bronze`- Namespaces with a Bronze subscription - `bronze`- Namespaces with a Bronze subscription
- `silver` - Namespaces with a Silver subscription - `silver` - Namespaces with a Silver subscription
- `gold` - Namespaces with a Gold subscription - `gold` - Namespaces with a Gold subscription
NOTE: **Note:** Hosted plans exist only on GitLab.com.
NOTE: **Note:** The test environment doesn't have any plans. NOTE: **Note:** The test environment doesn't have any plans.
...@@ -35,7 +35,7 @@ If you need to migrate all data over, you can leverage our [API](../../../api/RE ...@@ -35,7 +35,7 @@ If you need to migrate all data over, you can leverage our [API](../../../api/RE
The order of assets to migrate from a self-managed instance to GitLab.com is the following: The order of assets to migrate from a self-managed instance to GitLab.com is the following:
NOTE: **Note:** NOTE: **Note:**
When migrating to GitLab.com, users would need to be manually created unless [SCIM](../../../user/group/saml_sso/scim_setup.md) is going to be used. Creating users with the API is limited to self-hosted instances as it requires administrator access. When migrating to GitLab.com, users would need to be manually created unless [SCIM](../../../user/group/saml_sso/scim_setup.md) is going to be used. Creating users with the API is limited to self-managed instances as it requires administrator access.
1. [Groups](../../../api/groups.md) 1. [Groups](../../../api/groups.md)
1. [Projects](../../../api/projects.md) 1. [Projects](../../../api/projects.md)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment