Commit 7ecb4c9f authored by Russell Dickenson's avatar Russell Dickenson

Merge branch 'doc-enable-squash-option-by-default' into 'master'

Update squash  docs to be enabled by default

See merge request gitlab-org/gitlab!39384
parents 4f6d51a3 b278bb30
...@@ -92,10 +92,10 @@ squashing can itself be considered equivalent to rebasing. ...@@ -92,10 +92,10 @@ 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's deployed behind a feature flag, disabled by default. > - It's deployed behind a feature flag, enabled by default.
> - It's disabled on GitLab.com. > - It's enabled on GitLab.com.
> - It's not recommended for production use. > - It's recommended for production use.
> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-squash-commit-options-core-only). **(CORE ONLY)** > - For GitLab self-managed instances, GitLab administrator can opt to [disable it](#enable-or-disable-squash-commit-options-core-only). **(CORE ONLY)**
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**.
...@@ -120,8 +120,8 @@ squash commits locally through the command line and force-push to their remote b ...@@ -120,8 +120,8 @@ squash commits locally through the command line and force-push to their remote b
### Enable or disable Squash Commit Options **(CORE ONLY)** ### Enable or disable Squash Commit Options **(CORE ONLY)**
Squash Commit Options is under development and not ready for production use. It is Squash Commit Options is ready for production use. It is
deployed behind a feature flag that is **disabled by default**. deployed behind a feature flag that is **enabled by default**.
[GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md) [GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
can enable it for your instance. Squash Commit Options can be enabled or disabled per-project. can enable it for your instance. Squash Commit Options can be enabled or disabled per-project.
......
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