diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-02-19 00:38:24 +0300 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-02-19 00:38:24 +0300 |
| commit | 07c32a0df5306082fe800de1ae6e2c51325f46ef (patch) | |
| tree | 2d810bcd76a993ac71224de5b5f0b6a7707127df /.gitlab/merge_request_templates | |
| parent | f1645c744fcf8677ae14714914c4c4ffb9d5b17e (diff) | |
| parent | fe10964a6884162b9272ec3a32a5736c2a997ab2 (diff) | |
Merge branch 'master' into 'template-improvements-for-documentation'
# Conflicts:
# .gitlab/merge_request_templates/Documentation.md
Diffstat (limited to '.gitlab/merge_request_templates')
| -rw-r--r-- | .gitlab/merge_request_templates/Change documentation location.md | 2 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Database changes.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/merge_request_templates/Change documentation location.md b/.gitlab/merge_request_templates/Change documentation location.md index b4a6d2bd3b4..c80af95d5e5 100644 --- a/.gitlab/merge_request_templates/Change documentation location.md +++ b/.gitlab/merge_request_templates/Change documentation location.md @@ -26,7 +26,7 @@ https://docs.gitlab.com/ce/development/documentation/index.html#changing-documen to the new document if there are any Disqus comments on the old document thread. - [ ] Update the link in `features.yml` (if applicable) - [ ] If working on CE and the `ee-compat-check` jobs fails, submit an MR to EE - with the changes as well (https://docs.gitlab.com/ce/development/writing_documentation.html#cherry-picking-from-ce-to-ee). + with the changes as well (https://docs.gitlab.com/ce/development/documentation/index.html#cherry-picking-from-ce-to-ee). - [ ] Ping one of the technical writers for review. /label ~Documentation diff --git a/.gitlab/merge_request_templates/Database changes.md b/.gitlab/merge_request_templates/Database changes.md index 354393b60e0..3f457174492 100644 --- a/.gitlab/merge_request_templates/Database changes.md +++ b/.gitlab/merge_request_templates/Database changes.md @@ -16,7 +16,7 @@ Add a description of your merge request here. ## Database checklist -- [ ] Conforms to the [database guides](https://docs.gitlab.com/ee/development/README.html#databases-guides) +- [ ] Conforms to the [database guides](https://docs.gitlab.com/ee/development/README.html#database-guides) When adding migrations: @@ -49,10 +49,10 @@ When removing columns, tables, indexes or other structures: ## General checklist - [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary -- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/documentation/index.html#contributing-to-docs) +- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/documentation/) - [ ] [Tests added for this feature/bug](https://docs.gitlab.com/ee/development/testing_guide/index.html) - [ ] Conforms to the [code review guidelines](https://docs.gitlab.com/ee/development/code_review.html) - [ ] Conforms to the [merge request performance guidelines](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html) -- [ ] Conforms to the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides) +- [ ] Conforms to the [style guides](https://docs.gitlab.com/ee/development/contributing/style_guides.html) /label ~database |