From fb59f55f47c3b19c0cebcba319cbe89c8db3d509 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 19 Sep 2017 00:15:10 -0500 Subject: Fix MR docs link to fast-forward section --- doc/user/project/merge_requests/index.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'doc/user/project/merge_requests/index.md') 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. -- cgit v1.2.1