summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-10-27 09:45:10 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-10-27 09:45:10 +0000
commit284a94522fa3359b87f8b1c867d3416515ee8365 (patch)
tree80d8ef9c1b484503b5683dc568d185d02ef00e2f
parent7e5e6823af142709c953e4db1e178ec35a22fde5 (diff)
parentbe73ede362ca4f9700202c42f9eba74d58199042 (diff)
downloadgitlab-ce-284a94522fa3359b87f8b1c867d3416515ee8365.tar.gz
Merge branch 'patch-29' into 'master'
Semi-linear history merge is now available in CE. See merge request gitlab-org/gitlab-ce!15059
-rw-r--r--doc/user/project/merge_requests/index.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index 6289fcf3c2b..4b2e042251b 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -34,7 +34,6 @@ With **[GitLab Enterprise Edition][ee]**, you can also:
- View the deployment process across projects with [Multi-Project Pipeline Graphs](https://docs.gitlab.com/ee/ci/multi_project_pipeline_graphs.html#multi-project-pipeline-graphs) (available only in GitLab Enterprise Edition Premium)
- Request [approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) from your managers (available in GitLab Enterprise Edition Starter)
- [Squash and merge](https://docs.gitlab.com/ee/user/project/merge_requests/squash_and_merge.html) for a cleaner commit history (available in GitLab Enterprise Edition Starter)
-- Enable [semi-linear history merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/index.html#semi-linear-history-merge-requests) as another security layer to guarantee the pipeline is passing in the target branch (available in GitLab Enterprise Edition Starter)
- Analise the impact of your changes with [Code Quality reports](https://docs.gitlab.com/ee/user/project/merge_requests/code_quality_diff.html) (available in GitLab Enterprise Edition Starter)
## Use cases