Merge branch 'docs/ff-merge' into 'master'

Refactor fast-forward merge requests docs

See merge request !1137

doc/user/project/merge_requests.md

@@ -69,6 +69,8 @@ have been marked as a **Work In Progress**.
 
 ## Merge request approvals
 
+> Included in [GitLab Enterprise Edition Starter][products].
+
 If you want to make sure every merge request is approved by one or more people,
 you can enforce this workflow by using merge request approvals. Merge request
 approvals allow you to set the number of necessary approvals and predefine a
@@ -76,6 +78,15 @@ list of approvers that will need to approve every merge request in a project.
 
 [Read more about merge request approvals.](merge_requests/merge_request_approvals.md)
 
+## 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.
+
+[Read more about fast-forward merge requests.](merge_requests/fast_forward_merge.md)
+
 ## Ignore whitespace changes in Merge Request diff view
 
 If you click the **Hide whitespace changes** button, you can see the diff
@@ -175,4 +186,5 @@ And to check out a particular merge request:
 git checkout origin/merge-requests/1
 ```
 
+[products]: https://about.gitlab.com/products/ "GitLab products page"
 [protected branches]: protected_branches.md

doc/user/project/merge_requests/fast_forward_merge.md

-# Fast-forward merge
+# Fast-forward merge requests
 
-GitLab Enterprise Edition offers a way to accept merge requests without creating
-merge commits. If you prefer a linear git history, this might be a good feature
-for you.
+> Included in [GitLab Enterprise Edition Starter][products].
 
-You can configure this on a per-project basis by navigating to the project
-settings page and selecting the **Only fast-forward merging** checkbox.
+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.
+
+Navigate to the project's settings, select the **Fast-forward merge**
+option and hit **Save changes** for the changes to take effect.
 
 ![Fast forward merge in project settings](img/ff_merge.png)
 
-Now, when you visit the merge request page, you will be able to **accept it only
-if a fast-forward merge is possible**.
+Now, when you visit the merge request page, you will be able to accept it
+**only if a fast-forward merge is possible**.
+
+![Fast forward merge request](img/ff_merge_mr.png)
 
 If the target branch is ahead of the source branch, you need to rebase the
 source branch before you will be able to do a fast-forward merge.
 
-For simple rebase operations, you can use the
-[rebase before merge](rebase_before_merge.md) feature.
+[products]: https://about.gitlab.com/products/ "GitLab products page"

doc/workflow/README.md

@@ -39,8 +39,9 @@
   - [Revert changes in the UI](../user/project/merge_requests/revert_changes.md)
   - [Merge requests versions](../user/project/merge_requests/versions.md)
   - ["Work In Progress" merge requests](../user/project/merge_requests/work_in_progress_merge_requests.md)
-  - (EE) [Merge Request Approvals](../user/project/merge_requests/merge_request_approvals.md)
-- (EE) [Repository Mirroring](repository_mirroring.md)
+  - (EE) [Merge request approvals](../user/project/merge_requests/merge_request_approvals.md)
+  - (EE) [Fast-forward merge requests](../user/project/merge_requests/fast_forward_merge.md)
+- (EE) [Repository mirroring](repository_mirroring.md)
 - [Manage large binaries with Git LFS](lfs/manage_large_binaries_with_git_lfs.md)
 - [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md)
 - [Todos](todos.md)