diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 00:15:10 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 23:48:40 -0500 |
| commit | fb59f55f47c3b19c0cebcba319cbe89c8db3d509 (patch) | |
| tree | 3c53d7f511657c7ab1374a6a4e10333322610daf /doc/user/project/merge_requests/index.md | |
| parent | 8e7b88155658165baf70981033a9737ee0ad09f2 (diff) | |
| download | gitlab-ce-fb59f55f47c3b19c0cebcba319cbe89c8db3d509.tar.gz | |
Fix MR docs link to fast-forward section
Diffstat (limited to 'doc/user/project/merge_requests/index.md')
| -rw-r--r-- | doc/user/project/merge_requests/index.md | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 29b4dcbc5cf..00e1f336702 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -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) - 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) -- 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: @@ -92,8 +92,6 @@ in a merged merge requests or a commit. ## 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 creating merge commits, you can configure this on a per-project basis. |