diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-04 16:49:18 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-04 16:49:18 +0000 |
commit | 432929fd4553a1d606fa33889d02d28e79fd8064 (patch) | |
tree | 7306190bc4d4b584a436290f91bc3f8d1d6705eb | |
parent | e09bdd78431371fd30ca1862f0466eacba09a0d2 (diff) | |
parent | 6206f7f0a8fcb68df99edf96d52f8b3049ffce6a (diff) | |
download | gitlab-ce-432929fd4553a1d606fa33889d02d28e79fd8064.tar.gz |
Merge branch 'fix-dead-links' into 'master'
Fix dead links in the docs (Jun 2016)
## What does this MR do?
Fix dead links in the docs found as of Jun 2016.
## Are there points in the code the reviewer needs to double check?
n/a
## Why was this MR needed?
This MR must improve UX on docs.gitlab.com.
## What are the relevant issue numbers?
Closes #19156
## Does this MR meet the acceptance criteria?
- No [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) updated
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4921
-rw-r--r-- | doc/api/services.md | 2 | ||||
-rw-r--r-- | doc/ci/README.md | 2 | ||||
-rw-r--r-- | doc/development/ci_setup.md | 2 | ||||
-rw-r--r-- | doc/public_access/public_access.md | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/api/services.md b/doc/api/services.md index 32d6e2dea78..f821a614047 100644 --- a/doc/api/services.md +++ b/doc/api/services.md @@ -8,7 +8,7 @@ Asana - Teamwork without email Set Asana service for a project. -> This service adds commit messages as comments to Asana tasks. Once enabled, commit messages are checked for Asana task URLs (for example, `https://app.asana.com/0/123456/987654`) or task IDs starting with # (for example, `#987654`). Every task ID found will get the commit comment added to it. You can also close a task with a message containing: `fix #123456`. You can find your Api Keys here: http://developer.asana.com/documentation/#api_keys +> This service adds commit messages as comments to Asana tasks. Once enabled, commit messages are checked for Asana task URLs (for example, `https://app.asana.com/0/123456/987654`) or task IDs starting with # (for example, `#987654`). Every task ID found will get the commit comment added to it. You can also close a task with a message containing: `fix #123456`. You can find your Api Keys here: https://asana.com/developers/documentation/getting-started/auth#api-key ``` PUT /projects/:id/services/asana diff --git a/doc/ci/README.md b/doc/ci/README.md index 3dd4e2bc230..a9d407528e8 100644 --- a/doc/ci/README.md +++ b/doc/ci/README.md @@ -16,5 +16,5 @@ - [Trigger builds through the API](triggers/README.md) - [Build artifacts](build_artifacts/README.md) - [User permissions](permissions/README.md) -- [API](../../api/ci/README.md) +- [API](../api/ci/README.md) - [CI services (linked docker containers)](services/README.md) diff --git a/doc/development/ci_setup.md b/doc/development/ci_setup.md index 6776d9b083f..2f49b3564ab 100644 --- a/doc/development/ci_setup.md +++ b/doc/development/ci_setup.md @@ -21,7 +21,7 @@ We currently use three CI services to test GitLab: Core team has access to trigger builds if needed for GitLab CE. -We use [these build scripts](https://gitlab.com/gitlab-org/gitlab-ci/blob/master/doc/examples/build_script_gitlab_ce.md) for testing with GitLab CI. +We use [these build scripts](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.gitlab-ci.yml) for testing with GitLab CI. # Build configuration on [Semaphore](https://semaphoreapp.com/gitlabhq/gitlabhq/) for testing the [GitHub.com repo](https://github.com/gitlabhq/gitlabhq) diff --git a/doc/public_access/public_access.md b/doc/public_access/public_access.md index 17bb75ececd..9a5c5a5c92a 100644 --- a/doc/public_access/public_access.md +++ b/doc/public_access/public_access.md @@ -17,7 +17,7 @@ Public projects can be cloned **without any** authentication. They will also be listed on the public access directory (`/public`). -**Any logged in user** will have [Guest](../permissions/permissions) +**Any logged in user** will have [Guest](../permissions/permissions.md) permissions on the repository. ### Internal projects @@ -27,8 +27,8 @@ Internal projects can be cloned by any logged in user. They will also be listed on the public access directory (`/public`) for logged in users. -Any logged in user will have [Guest](../permissions/permissions) permissions on -the repository. +Any logged in user will have [Guest](../permissions/permissions.md) permissions +on the repository. ### How to change project visibility |