summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/issue_templates/Feature proposal.md (renamed from .gitlab/issue_templates/Feature Proposal.md)0
-rw-r--r--.gitlab/issue_templates/Research proposal.md (renamed from .gitlab/issue_templates/Research Proposal.md)0
-rw-r--r--.gitlab/issue_templates/Security developer workflow.md (renamed from .gitlab/issue_templates/Security Developer Workflow.md)1
-rw-r--r--.gitlab/merge_request_templates/Database changes.md (renamed from .gitlab/merge_request_templates/Database Changes.md)4
4 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab/issue_templates/Feature Proposal.md b/.gitlab/issue_templates/Feature proposal.md
index c4065d3c4ea..c4065d3c4ea 100644
--- a/.gitlab/issue_templates/Feature Proposal.md
+++ b/.gitlab/issue_templates/Feature proposal.md
diff --git a/.gitlab/issue_templates/Research Proposal.md b/.gitlab/issue_templates/Research proposal.md
index 5676656793d..5676656793d 100644
--- a/.gitlab/issue_templates/Research Proposal.md
+++ b/.gitlab/issue_templates/Research proposal.md
diff --git a/.gitlab/issue_templates/Security Developer Workflow.md b/.gitlab/issue_templates/Security developer workflow.md
index 0c878dbf64c..c1f702e9385 100644
--- a/.gitlab/issue_templates/Security Developer Workflow.md
+++ b/.gitlab/issue_templates/Security developer workflow.md
@@ -39,6 +39,7 @@ Set the title to: `[Security] Description of the original issue`
- [ ] Add the nickname of the external user who found the issue (and/or HackerOne profile) to the Thanks row in the [details section](#details)
### Summary
+
#### Links
| Description | Link |
diff --git a/.gitlab/merge_request_templates/Database Changes.md b/.gitlab/merge_request_templates/Database changes.md
index 1c4f30d9320..d14d52e1b6b 100644
--- a/.gitlab/merge_request_templates/Database Changes.md
+++ b/.gitlab/merge_request_templates/Database changes.md
@@ -1,7 +1,7 @@
Add a description of your merge request here. Merge requests without an adequate
description will not be reviewed until one is added.
-## Database Checklist
+## Database checklist
When adding migrations:
@@ -31,7 +31,7 @@ When removing columns, tables, indexes or other structures:
- [ ] Removed these in a post-deployment migration
- [ ] Made sure the application no longer uses (or ignores) these structures
-## General Checklist
+## General checklist
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)