summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-09-08 12:39:57 -0300
committerMarcia Ramos <virtua.creative@gmail.com>2017-09-08 12:39:57 -0300
commit5428b621e336196c6dc9c411fc9e3812f12d3455 (patch)
tree6342d21691d732eb52d97f0e63e54c8374c91e1c
parent3b9b988723a64858a4cc24a41ac18f8169d7671f (diff)
downloadgitlab-ce-5428b621e336196c6dc9c411fc9e3812f12d3455.tar.gz
copyedit
-rw-r--r--doc/user/project/settings/index.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md
index d5fbb0950a8..22c343dc027 100644
--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -23,11 +23,11 @@ Add an [issue description template](../description_templates.md#description-temp
Set up your project's merge request settings:
-- Set up the merge request method (merge commit, [fast-forward merge](https://docs.gitlab.com/ee/user/project/merge_requests/fast_forward_merge.html#fast-forward-merge-requests)). Fast-forward is available in [GitLab Enterprise Edition Starter](https://about.gitlab.com/gitlab-ee/).
-- Merge request [description templates](../description_templates.md#description-templates)
-- Enable [merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html#merge-request-approvals), available in [GitLab Enterprise Edition Starter](https://about.gitlab.com/gitlab-ee/).
-- Enable [merge only of pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md)
-- Enable [merge only when all discussions are resolved](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-discussions-are-resolved)
+- Set up the merge request method (merge commit, [fast-forward merge](https://docs.gitlab.com/ee/user/project/merge_requests/fast_forward_merge.html#fast-forward-merge-requests)). _Fast-forward is available in [GitLab Enterprise Edition Starter](https://about.gitlab.com/gitlab-ee/)._
+- Merge request [description templates](../description_templates.md#description-templates).
+- Enable [merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html#merge-request-approvals), _available in [GitLab Enterprise Edition Starter](https://about.gitlab.com/gitlab-ee/)_.
+- Enable [merge only of pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md).
+- Enable [merge only when all discussions are resolved](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-discussions-are-resolved).
![project's merge request settings](img/merge_requests_settings.png)