Skip to content

G
gitlab-ce
Commit d23e9c46 authored by Marcin Sedlak-Jakubowski's avatar Marcin Sedlak-Jakubowski Committed by Craig Norris
Browse files
Options

Fix inconsistent wording in the feature flag docs guide

parent 5d068c65
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 67 deletions
doc/administration/geo/replication/geo_validation_tests.md
View file @ d23e9c46
...@@ -148,7 +148,7 @@ The following are PostgreSQL upgrade validation tests we performed. ...@@ -148,7 +148,7 @@ The following are PostgreSQL upgrade validation tests we performed.
[PostgreSQL 11 upgrade procedure for Geo installations](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/4975): [PostgreSQL 11 upgrade procedure for Geo installations](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/4975):
- Description: Prior to making PostgreSQL 11 the default version of PostgreSQL in GitLab 12.10, we - Description: Prior to making PostgreSQL 11 the default version of PostgreSQL in GitLab 12.10, we
tested upgrading to PostgreSQL 11 in Geo deployments on GitLab 12.9. tested upgrading to PostgreSQL 11 in Geo deployments in GitLab 12.9.
- Outcome: Partially successful. Issues were discovered in multi-node configurations with a separate - Outcome: Partially successful. Issues were discovered in multi-node configurations with a separate
tracking database and concerns were raised about allowing automatic upgrades when Geo enabled. tracking database and concerns were raised about allowing automatic upgrades when Geo enabled.
- Follow up issues: - Follow up issues:
......
doc/development/documentation/feature_flags.md
View file @ d23e9c46
...@@ -62,10 +62,10 @@ be enabled for a single project, and is not ready for production use: ...@@ -62,10 +62,10 @@ be enabled for a single project, and is not ready for production use:
# Feature Name # Feature Name
> - [Introduced](link-to-issue) in GitLab 12.0. > - [Introduced](link-to-issue) in GitLab 12.0.
> - It's [deployed behind a feature flag](<replace with path to>/user/feature_flags.md), disabled by default. > - [Deployed behind a feature flag](<replace with path to>/user/feature_flags.md), disabled by default.
> - It's disabled on GitLab.com. > - Disabled on GitLab.com.
> - It's not recommended for production use. > - Not recommended for production use.
> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#anchor-to-section). **(FREE SELF)** > - To use in GitLab self-managed instances, ask a GitLab administrator to [enable it](#anchor-to-section). **(FREE SELF)**
WARNING: WARNING:
This feature might not be available to you. Check the **version history** note above for details. This feature might not be available to you. Check the **version history** note above for details.
...@@ -120,10 +120,10 @@ use: ...@@ -120,10 +120,10 @@ use:
# Feature Name # Feature Name
> - [Introduced](link-to-issue) in GitLab 12.0. > - [Introduced](link-to-issue) in GitLab 12.0.
> - It was [deployed behind a feature flag](<replace with path to>/user/feature_flags.md), disabled by default. > - [Deployed behind a feature flag](<replace with path to>/user/feature_flags.md), disabled by default.
> - [Became enabled by default](link-to-issue) on GitLab 12.1. > - [Enabled by default](link-to-issue) in GitLab 12.1.
> - It's enabled on GitLab.com. > - Enabled on GitLab.com.
> - It's recommended for production use. > - Recommended for production use.
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#anchor-to-section). **(FREE SELF)** > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#anchor-to-section). **(FREE SELF)**
WARNING: WARNING:
...@@ -177,9 +177,9 @@ cannot be enabled for a single project, and is ready for production use: ...@@ -177,9 +177,9 @@ cannot be enabled for a single project, and is ready for production use:
# Feature Name # Feature Name
> - [Introduced](link-to-issue) in GitLab 12.0. > - [Introduced](link-to-issue) in GitLab 12.0.
> - It's [deployed behind a feature flag](<replace with path to>/user/feature_flags.md), enabled by default. > - [Deployed behind a feature flag](<replace with path to>/user/feature_flags.md), enabled by default.
> - It's enabled on GitLab.com. > - Enabled on GitLab.com.
> - It's recommended for production use. > - Recommended for production use.
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#anchor-to-section). **(FREE SELF)** > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#anchor-to-section). **(FREE SELF)**
WARNING: WARNING:
...@@ -249,10 +249,10 @@ be enabled by project, and is ready for production use: ...@@ -249,10 +249,10 @@ be enabled by project, and is ready for production use:
# Feature Name # Feature Name
> - [Introduced](link-to-issue) in GitLab 12.0. > - [Introduced](link-to-issue) in GitLab 12.0.
> - It's [deployed behind a feature flag](<replace with path to>/user/feature_flags.md), enabled by default. > - [Deployed behind a feature flag](<replace with path to>/user/feature_flags.md), enabled by default.
> - It's enabled on GitLab.com. > - Enabled on GitLab.com.
> - It can be enabled or disabled for a single project. > - Can be enabled or disabled for a single project.
> - It's recommended for production use. > - Recommended for production use.
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#anchor-to-section). **(FREE SELF)** > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#anchor-to-section). **(FREE SELF)**
WARNING: WARNING:
......
doc/raketasks/backup_restore.md
View file @ d23e9c46
...@@ -941,7 +941,7 @@ Users of GitLab 12.1 and earlier should use the command `gitlab-rake gitlab:back ...@@ -941,7 +941,7 @@ Users of GitLab 12.1 and earlier should use the command `gitlab-rake gitlab:back
WARNING: WARNING:
`gitlab-rake gitlab:backup:restore` doesn't set the correct file system `gitlab-rake gitlab:backup:restore` doesn't set the correct file system
permissions on your Registry directory. This is a [known issue](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/62759). permissions on your Registry directory. This is a [known issue](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/62759).
On GitLab 12.2 or later, you can use `gitlab-backup restore` to avoid this In GitLab 12.2 or later, you can use `gitlab-backup restore` to avoid this
issue. issue.
If there's a GitLab version mismatch between your backup tar file and the If there's a GitLab version mismatch between your backup tar file and the
...@@ -963,7 +963,7 @@ sudo gitlab-ctl restart ...@@ -963,7 +963,7 @@ sudo gitlab-ctl restart
sudo gitlab-rake gitlab:check SANITIZE=true sudo gitlab-rake gitlab:check SANITIZE=true
``` ```
On GitLab 13.1 and later, check [database values can be decrypted](../administration/raketasks/doctor.md) In GitLab 13.1 and later, check [database values can be decrypted](../administration/raketasks/doctor.md)
especially if `/etc/gitlab/gitlab-secrets.json` was restored, or if a different server is especially if `/etc/gitlab/gitlab-secrets.json` was restored, or if a different server is
the target for the restore. the target for the restore.
...@@ -1011,7 +1011,7 @@ Users of GitLab 12.1 and earlier should use the command `gitlab-rake gitlab:back ...@@ -1011,7 +1011,7 @@ Users of GitLab 12.1 and earlier should use the command `gitlab-rake gitlab:back
WARNING: WARNING:
`gitlab-rake gitlab:backup:restore` doesn't set the correct file system `gitlab-rake gitlab:backup:restore` doesn't set the correct file system
permissions on your Registry directory. This is a [known issue](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/62759). permissions on your Registry directory. This is a [known issue](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/62759).
On GitLab 12.2 or later, you can use `gitlab-backup restore` to avoid this In GitLab 12.2 or later, you can use `gitlab-backup restore` to avoid this
issue. issue.
The GitLab Helm chart uses a different process, documented in The GitLab Helm chart uses a different process, documented in
......
doc/topics/autodevops/stages.md
View file @ d23e9c46
...@@ -137,8 +137,7 @@ might want to use a [custom buildpack](customize.md#custom-buildpacks). ...@@ -137,8 +137,7 @@ might want to use a [custom buildpack](customize.md#custom-buildpacks).
## Auto Code Quality ## Auto Code Quality
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1984) in [GitLab](https://about.gitlab.com/pricing/) 9.3. > - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/212499) to GitLab Free in 13.2.
> - Made [available in all tiers](https://gitlab.com/gitlab-org/gitlab/-/issues/212499) in GitLab 13.2.
Auto Code Quality uses the Auto Code Quality uses the
[Code Quality image](https://gitlab.com/gitlab-org/ci-cd/codequality) to run [Code Quality image](https://gitlab.com/gitlab-org/ci-cd/codequality) to run
...@@ -165,7 +164,7 @@ see the documentation. ...@@ -165,7 +164,7 @@ see the documentation.
## Auto Secret Detection ## Auto Secret Detection
> - Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.1. > - Introduced in GitLab Ultimate 13.1.
> - [Select functionality made available in all tiers](../../user/application_security/secret_detection/#making-secret-detection-available-to-all-gitlab-tiers) in 13.3 > - [Select functionality made available in all tiers](../../user/application_security/secret_detection/#making-secret-detection-available-to-all-gitlab-tiers) in 13.3
Secret Detection uses the Secret Detection uses the
...@@ -179,8 +178,6 @@ To learn more, see [Secret Detection](../../user/application_security/secret_det ...@@ -179,8 +178,6 @@ To learn more, see [Secret Detection](../../user/application_security/secret_det
## Auto Dependency Scanning **(ULTIMATE)** ## Auto Dependency Scanning **(ULTIMATE)**
> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.7.
Dependency Scanning runs analysis on the project's dependencies and checks for potential security issues. Dependency Scanning runs analysis on the project's dependencies and checks for potential security issues.
The Auto Dependency Scanning stage is skipped on licenses other than The Auto Dependency Scanning stage is skipped on licenses other than
[Ultimate](https://about.gitlab.com/pricing/) and requires [Ultimate](https://about.gitlab.com/pricing/) and requires
...@@ -195,7 +192,7 @@ see the documentation. ...@@ -195,7 +192,7 @@ see the documentation.
## Auto License Compliance **(ULTIMATE)** ## Auto License Compliance **(ULTIMATE)**
> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.0. > Introduced in GitLab Ultimate 11.0.
License Compliance uses the License Compliance uses the
[License Compliance Docker image](https://gitlab.com/gitlab-org/security-products/analyzers/license-finder) [License Compliance Docker image](https://gitlab.com/gitlab-org/security-products/analyzers/license-finder)
...@@ -211,8 +208,6 @@ documentation. ...@@ -211,8 +208,6 @@ documentation.
## Auto Container Scanning **(ULTIMATE)** ## Auto Container Scanning **(ULTIMATE)**
> Introduced in GitLab 10.4.
Vulnerability Static Analysis for containers uses [Clair](https://github.com/quay/clair) Vulnerability Static Analysis for containers uses [Clair](https://github.com/quay/clair)
to check for potential security issues on Docker images. The Auto Container Scanning to check for potential security issues on Docker images. The Auto Container Scanning
stage is skipped on licenses other than [Ultimate](https://about.gitlab.com/pricing/). stage is skipped on licenses other than [Ultimate](https://about.gitlab.com/pricing/).
...@@ -263,8 +258,6 @@ in the first place, and thus not realize that it needs to re-apply the old confi ...@@ -263,8 +258,6 @@ in the first place, and thus not realize that it needs to re-apply the old confi
## Auto DAST **(ULTIMATE)** ## Auto DAST **(ULTIMATE)**
> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.4.
Dynamic Application Security Testing (DAST) uses the popular open source tool Dynamic Application Security Testing (DAST) uses the popular open source tool
[OWASP ZAProxy](https://github.com/zaproxy/zaproxy) to analyze the current code [OWASP ZAProxy](https://github.com/zaproxy/zaproxy) to analyze the current code
and check for potential security issues. The Auto DAST stage is skipped on and check for potential security issues. The Auto DAST stage is skipped on
...@@ -422,10 +415,10 @@ including support for `Deployment` in the `extensions/v1beta1` version. ...@@ -422,10 +415,10 @@ including support for `Deployment` in the `extensions/v1beta1` version.
To use Auto Deploy on a Kubernetes 1.16+ cluster: To use Auto Deploy on a Kubernetes 1.16+ cluster:
1. If you are deploying your application for the first time on GitLab 13.0 or 1. If you are deploying your application for the first time in GitLab 13.0 or
newer, no configuration should be required. newer, no configuration should be required.
1. On GitLab 12.10 or older, set the following in the [`.gitlab/auto-deploy-values.yaml` file](customize.md#customize-values-for-helm-chart): 1. In GitLab 12.10 or older, set the following in the [`.gitlab/auto-deploy-values.yaml` file](customize.md#customize-values-for-helm-chart):
```yaml ```yaml
deploymentApiVersion: apps/v1 deploymentApiVersion: apps/v1
...@@ -439,7 +432,7 @@ To use Auto Deploy on a Kubernetes 1.16+ cluster: ...@@ -439,7 +432,7 @@ To use Auto Deploy on a Kubernetes 1.16+ cluster:
GitLab 12.9 or 12.10, set `AUTO_DEVOPS_POSTGRES_CHANNEL` to `2`. GitLab 12.9 or 12.10, set `AUTO_DEVOPS_POSTGRES_CHANNEL` to `2`.
WARNING: WARNING:
On GitLab 12.9 and 12.10, opting into In GitLab 12.9 and 12.10, opting into
`AUTO_DEVOPS_POSTGRES_CHANNEL` version `2` deletes the version `1` PostgreSQL `AUTO_DEVOPS_POSTGRES_CHANNEL` version `2` deletes the version `1` PostgreSQL
database. Follow the [guide to upgrading PostgreSQL](upgrading_postgresql.md) database. Follow the [guide to upgrading PostgreSQL](upgrading_postgresql.md)
to back up and restore your database before opting into version `2` (On to back up and restore your database before opting into version `2` (On
......
doc/topics/git/lfs/index.md
View file @ d23e9c46
...@@ -114,10 +114,10 @@ See the documentation on [File Locking](../../../user/project/file_lock.md). ...@@ -114,10 +114,10 @@ See the documentation on [File Locking](../../../user/project/file_lock.md).
## LFS objects in project archives ## LFS objects in project archives
> - Support for including Git LFS blobs inside [project source downloads](../../../user/project/repository/index.md) was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15079) in GitLab 13.5. > - Support for including Git LFS blobs inside [project source downloads](../../../user/project/repository/index.md) was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15079) in GitLab 13.5.
> - It was [deployed behind a feature flag](../../../user/feature_flags.md), disabled by default. > - [Deployed behind a feature flag](../../../user/feature_flags.md), disabled by default.
> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/268409) on GitLab 13.6. > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/268409) in GitLab 13.6.
> - It's enabled on GitLab.com. > - Enabled on GitLab.com.
> - It's recommended for production use. > - Recommended for production use.
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-lfs-objects-in-project-archives). > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-lfs-objects-in-project-archives).
WARNING: WARNING:
......
doc/update/index.md
View file @ d23e9c46
...@@ -405,7 +405,7 @@ fail for [multi-node GitLab installations](https://docs.gitlab.com/omnibus/updat ...@@ -405,7 +405,7 @@ fail for [multi-node GitLab installations](https://docs.gitlab.com/omnibus/updat
So, if you are using multiple Rails servers and specifically upgrading from 13.0, So, if you are using multiple Rails servers and specifically upgrading from 13.0,
all servers must first be upgraded to 13.1.Z before upgrading to 13.2.0 or later: all servers must first be upgraded to 13.1.Z before upgrading to 13.2.0 or later:
1. Ensure all GitLab web nodes are on GitLab 13.1.Z. 1. Ensure all GitLab web nodes are running GitLab 13.1.Z.
1. Optionally, enable the `global_csrf_token` feature flag to enable new 1. Optionally, enable the `global_csrf_token` feature flag to enable new
method of CSRF token generation: method of CSRF token generation:
......
doc/user/admin_area/credentials_inventory.md
View file @ d23e9c46
...@@ -56,10 +56,10 @@ The instance then notifies the user. ...@@ -56,10 +56,10 @@ The instance then notifies the user.
## Review existing GPG keys ## Review existing GPG keys
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/282429) in GitLab 13.10. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/282429) in GitLab 13.10.
> - It was [deployed behind a feature flag](../feature_flags.md), disabled by default. > - [Deployed behind a feature flag](../feature_flags.md), disabled by default.
> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/292961) on GitLab 13.11. > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/292961) in GitLab 13.11.
> - It's enabled on GitLab.com. > - Enabled on GitLab.com.
> - It's recommended for production use. > - Recommended for production use.
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-the-gpg-keys-view). > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-the-gpg-keys-view).
WARNING: WARNING:
......
doc/user/clusters/applications.md
View file @ d23e9c46
...@@ -91,7 +91,7 @@ apps were fetched from the central Helm stable repository (`https://kubernetes-c ...@@ -91,7 +91,7 @@ apps were fetched from the central Helm stable repository (`https://kubernetes-c
This repository [was deleted](https://github.com/helm/charts#deprecation-timeline) This repository [was deleted](https://github.com/helm/charts#deprecation-timeline)
on November 13, 2020. This causes the installation CI/CD pipeline to on November 13, 2020. This causes the installation CI/CD pipeline to
fail. Upgrade to GitLab 13.6, or alternatively, you can fail. Upgrade to GitLab 13.6, or alternatively, you can
use the following `.gitlab-ci.yml`, which has been tested on GitLab 13.5: use the following `.gitlab-ci.yml`, which has been tested in GitLab 13.5:
```yaml ```yaml
include: include:
...@@ -1062,7 +1062,7 @@ supported by GitLab before installing any of the applications. ...@@ -1062,7 +1062,7 @@ supported by GitLab before installing any of the applications.
used to install the GitLab-managed apps. GitLab runs each `helm` command used to install the GitLab-managed apps. GitLab runs each `helm` command
in a pod in the `gitlab-managed-apps` namespace inside the cluster. in a pod in the `gitlab-managed-apps` namespace inside the cluster.
- For clusters created on GitLab 13.6 and newer, GitLab uses Helm 3 to manage - For clusters created in GitLab 13.6 and newer, GitLab uses Helm 3 to manage
applications. applications.
- For clusters created on versions of GitLab prior to 13.6, GitLab uses Helm 2 - For clusters created on versions of GitLab prior to 13.6, GitLab uses Helm 2
with a local [Tiller](https://v2.helm.sh/docs/glossary/#tiller) server. Prior with a local [Tiller](https://v2.helm.sh/docs/glossary/#tiller) server. Prior
......
doc/user/discussions/index.md
View file @ d23e9c46
...@@ -269,10 +269,10 @@ Additionally, locked issues and merge requests can't be reopened. ...@@ -269,10 +269,10 @@ Additionally, locked issues and merge requests can't be reopened.
## Confidential Comments ## Confidential Comments
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207473) in GitLab 13.9. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207473) in GitLab 13.9.
> - It's [deployed behind a feature flag](../feature_flags.md), disabled by default. > - [Deployed behind a feature flag](../feature_flags.md), disabled by default.
> - It's disabled on GitLab.com. > - Disabled on GitLab.com.
> - It's not recommended for production use. > - Not recommended for production use.
> - To use it in GitLab self-managed instances, ask a GitLab administrator to enable it. **(FREE SELF)** > - To use in GitLab self-managed instances, ask a GitLab administrator to enable it. **(FREE SELF)**
WARNING: WARNING:
This feature might not be available to you. Check the **version history** note above for details. This feature might not be available to you. Check the **version history** note above for details.
...@@ -285,7 +285,7 @@ To create a confidential comment, select the **Make this comment confidential** ...@@ -285,7 +285,7 @@ To create a confidential comment, select the **Make this comment confidential**
## Merge request reviews ## Merge request reviews
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4213) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.4. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4213) in GitLab Premium 11.4.
> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/28154) to GitLab Free in 13.1. > - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/28154) to GitLab Free in 13.1.
When looking at a merge request diff, you are able to start a review. When looking at a merge request diff, you are able to start a review.
...@@ -487,9 +487,9 @@ introduced by [#25381](https://gitlab.com/gitlab-org/gitlab/-/issues/25381). ...@@ -487,9 +487,9 @@ introduced by [#25381](https://gitlab.com/gitlab-org/gitlab/-/issues/25381).
### Batch Suggestions ### Batch Suggestions
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/25486) in GitLab 13.1 as an [alpha feature](https://about.gitlab.com/handbook/product/gitlab-the-product/#alpha). > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/25486) in GitLab 13.1 as an [alpha feature](https://about.gitlab.com/handbook/product/gitlab-the-product/#alpha).
> - It was deployed behind a feature flag, disabled by default. > - Deployed behind a feature flag, disabled by default.
> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/227799) on GitLab 13.2. > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/227799) in GitLab 13.2.
> - It's enabled on GitLab.com. > - Enabled on GitLab.com.
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-batch-suggestions). > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-batch-suggestions).
You can apply multiple suggestions at once to reduce the number of commits added You can apply multiple suggestions at once to reduce the number of commits added
......
doc/user/group/iterations/index.md
View file @ d23e9c46
...@@ -8,11 +8,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -8,11 +8,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Iterations **(PREMIUM)** # Iterations **(PREMIUM)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/214713) in GitLab 13.1. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/214713) in GitLab 13.1.
> - It was deployed behind a feature flag, disabled by default. > - Deployed behind a feature flag, disabled by default.
> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/221047) on GitLab 13.2. > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/221047) in GitLab 13.2.
> - It's enabled on GitLab.com. > - Enabled on GitLab.com.
> - It's able to be enabled or disabled per-group. > - Able to be enabled or disabled per-group.
> - It's recommended for production use. > - Recommended for production use.
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#disable-iterations). **(PREMIUM ONLY)** > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#disable-iterations). **(PREMIUM ONLY)**
> - Moved to GitLab Premium in 13.9. > - Moved to GitLab Premium in 13.9.
......
doc/user/project/merge_requests/getting_started.md
View file @ d23e9c46
...@@ -206,10 +206,10 @@ is set for deletion, the merge request widget displays the ...@@ -206,10 +206,10 @@ is set for deletion, the merge request widget displays the
### Branch retargeting on merge **(FREE SELF)** ### Branch retargeting on merge **(FREE SELF)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9.
> - It's [deployed behind a feature flag](../../feature_flags.md), disabled by default. > - [Deployed behind a feature flag](../../feature_flags.md), disabled by default.
> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/320895) on GitLab 13.10. > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/320895) in GitLab 13.10.
> - It's recommended for production use. > - Recommended for production use.
> - To use it in GitLab self-managed instances, ask a GitLab administrator to [disable it](#enable-or-disable-branch-retargeting-on-merge). **(FREE SELF)** > - To use in GitLab self-managed instances, ask a GitLab administrator to [disable it](#enable-or-disable-branch-retargeting-on-merge). **(FREE SELF)**
In specific circumstances, GitLab can retarget the destination branch of In specific circumstances, GitLab can retarget the destination branch of
open merge request, if the destination branch merges while the merge request is open merge request, if the destination branch merges while the merge request is
......
doc/user/project/merge_requests/squash_and_merge.md
View file @ d23e9c46
...@@ -7,8 +7,7 @@ type: reference, concepts ...@@ -7,8 +7,7 @@ type: reference, concepts
# Squash and merge **(FREE)** # Squash and merge **(FREE)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1024) in [GitLab Starter](https://about.gitlab.com/pricing/) 8.17. > - [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18956) to GitLab Free in 11.0.
> - [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18956) from [GitLab Starter](https://about.gitlab.com/pricing/)to GitLab Free in 11.0.
With squash and merge you can combine all your merge request's commits into one With squash and merge you can combine all your merge request's commits into one
and retain a clean history. and retain a clean history.
...@@ -105,11 +104,11 @@ squashing can itself be considered equivalent to rebasing. ...@@ -105,11 +104,11 @@ squashing can itself be considered equivalent to rebasing.
## Squash Commits Options ## Squash Commits Options
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/17613) in GitLab 13.2. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/17613) in GitLab 13.2.
> - It was deployed behind a feature flag, disabled by default. > - Deployed behind a feature flag, disabled by default.
> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39382) on GitLab 13.3. > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39382) in GitLab 13.3.
> - It's enabled on GitLab.com. > - Enabled on GitLab.com.
> - It can be enabled per project. > - Can be enabled per project.
> - It's recommended for production use. > - Recommended for production use.
With Squash Commits Options you can configure the behavior of Squash and Merge for your project. With Squash Commits Options you can configure the behavior of Squash and Merge for your project.
To set it up, navigate to your project's **Settings > General** and expand **Merge requests**. To set it up, navigate to your project's **Settings > General** and expand **Merge requests**.
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7