Commit fb59f55f authored by Eric Eastwood's avatar Eric Eastwood

Fix MR docs link to fast-forward section

parent 8e7b8815
...@@ -23,7 +23,7 @@ With GitLab merge requests, you can: ...@@ -23,7 +23,7 @@ With GitLab merge requests, you can:
- Organize your issues and merge requests consistently throughout the project with [labels](../../project/labels.md) - Organize your issues and merge requests consistently throughout the project with [labels](../../project/labels.md)
- Add a time estimation and the time spent with that merge request with [Time Tracking](../../../workflow/time_tracking.html#time-tracking) - Add a time estimation and the time spent with that merge request with [Time Tracking](../../../workflow/time_tracking.html#time-tracking)
- [Resolve merge conflicts from the UI](#resolve-conflicts) - [Resolve merge conflicts from the UI](#resolve-conflicts)
- Enable [fast-forward merge requests](https://docs.gitlab.com/ce/user/project/merge_requests/fast_forward_merge.html) - Enable [fast-forward merge requests](#fast-forward-merge-requests)
With **[GitLab Enterprise Edition][ee]**, you can also: With **[GitLab Enterprise Edition][ee]**, you can also:
...@@ -92,8 +92,6 @@ in a merged merge requests or a commit. ...@@ -92,8 +92,6 @@ in a merged merge requests or a commit.
## Fast-forward merge requests ## Fast-forward merge requests
> Included in [GitLab Enterprise Edition Starter][products].
If you prefer a linear Git history and a way to accept merge requests without If you prefer a linear Git history and a way to accept merge requests without
creating merge commits, you can configure this on a per-project basis. creating merge commits, you can configure this on a per-project basis.
......
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