From 3b9b988723a64858a4cc24a41ac18f8169d7671f Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Fri, 8 Sep 2017 12:33:37 -0300 Subject: fixes link --- doc/user/project/settings/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index cd73c0687d6..d5fbb0950a8 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -5,7 +5,7 @@ to your project's homepage and clicking **Settings**. ## General settings -Adjust your project's path and name, description, avatar, [default branch](../repository/branches/index.md#default-branches), and tags: +Adjust your project's path and name, description, avatar, [default branch](../repository/branches/index.md#default-branch), and tags: ![general project settings](img/general_settings.png) -- cgit v1.2.1 From 5428b621e336196c6dc9c411fc9e3812f12d3455 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Fri, 8 Sep 2017 12:39:57 -0300 Subject: copyedit --- doc/user/project/settings/index.md | 10 +++++----- 1 file 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) -- cgit v1.2.1 From 1530457ecaeb703c1a6a9bf0a605a560fe0489a4 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Fri, 8 Sep 2017 12:40:15 -0300 Subject: index project settings doc from other indexes --- doc/README.md | 1 + doc/user/project/index.md | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/doc/README.md b/doc/README.md index 0d82a09d1f4..c6500a37aa9 100644 --- a/doc/README.md +++ b/doc/README.md @@ -53,6 +53,7 @@ Shortcuts to GitLab's most visited docs: ### Projects and groups - [Projects](user/project/index.md): + - [Project settings](user/project/settings/index.md) - [Create a project](gitlab-basics/create-project.md) - [Fork a project](gitlab-basics/fork-project.md) - [Importing and exporting projects between instances](user/project/settings/import_export.md). diff --git a/doc/user/project/index.md b/doc/user/project/index.md index a56b3744480..03bbc46bd8c 100644 --- a/doc/user/project/index.md +++ b/doc/user/project/index.md @@ -89,6 +89,10 @@ You can [fork a project](../../gitlab-basics/fork-project.md) in order to: from your fork to the upstream project - Fork a sample project to work on the top of that +## Project settings + +Read through the documentation on [project settings](settings/index.md). + ## Import or export a project - [Import a project](import/index.md) from: -- cgit v1.2.1