summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2017-10-02 14:29:17 +0300
committerValery Sizov <valery@gitlab.com>2017-10-02 14:29:17 +0300
commite559b8511b2817b9c57a5190ff9ed95c739528bf (patch)
treec4aeece8adab48b7158909eb1b7be39d465e4f47
parenta0ac2d932c20d10346b0becafe37a28b02c7eea8 (diff)
downloadgitlab-ce-ff_port_from_ee.tar.gz
Update MR doc to indicate that the linear-history feature is available for CE as wellff_port_from_ee
-rw-r--r--doc/user/project/merge_requests/index.md2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index edd07610f07..8e081b4f0b8 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -93,8 +93,6 @@ in a merged merge requests or a commit.
## Semi-linear history merge requests
-> Included in [GitLab Enterprise Edition Starter][products].
-
A merge commit is created for every merge, but the branch is only merged if
a fast-forward merge is possible. This ensures that if the merge request build
succeeded, the target branch build will also succeed after merging.