diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2017-09-08 16:26:13 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-09-08 16:26:13 +0000 |
commit | 5b2594b6b812d2af2864167669accc54ee188f05 (patch) | |
tree | a419c8f781a21e87b9e61d1bdccdfa759459c849 | |
parent | cf9f560d51e9ed7a6315ddce9ffaadc9f29df77f (diff) | |
parent | 1530457ecaeb703c1a6a9bf0a605a560fe0489a4 (diff) | |
download | gitlab-ce-5b2594b6b812d2af2864167669accc54ee188f05.tar.gz |
Merge branch 'docs-quick-fix' into 'master'
Docs: quick fix - indexes project settings
See merge request !14158
-rw-r--r-- | doc/README.md | 1 | ||||
-rw-r--r-- | doc/user/project/index.md | 4 | ||||
-rw-r--r-- | doc/user/project/settings/index.md | 12 |
3 files changed, 11 insertions, 6 deletions
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: diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index cd73c0687d6..22c343dc027 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) @@ -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) |