diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-15 13:51:02 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-15 13:51:02 +0300 |
| commit | bf806712835869046c819f84ee515caa8829c10d (patch) | |
| tree | 87f28c11278c8de2106a838dfe69cf1146b7ab84 | |
| parent | 13239cd85c21ad5965ee85f068fb4f69f6be1a4c (diff) | |
| parent | 3ec91d00e9295aaa7aee5bd58359224b74c5d0a8 (diff) | |
Merge branch '31662-remove-squashed-related-commits-together-from-default-mr-template' into 'master'
Resolve "Remove `Squashed related commits together` from default MR template"
Closes #31662
See merge request gitlab-org/gitlab-ce!18961
| -rw-r--r-- | .gitlab/merge_request_templates/Database Changes.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab/merge_request_templates/Database Changes.md b/.gitlab/merge_request_templates/Database Changes.md index b81900f67e1..1c4f30d9320 100644 --- a/.gitlab/merge_request_templates/Database Changes.md +++ b/.gitlab/merge_request_templates/Database Changes.md @@ -42,7 +42,9 @@ When removing columns, tables, indexes or other structures: - [ ] Has been reviewed by a Database specialist - [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides) -- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) +- [ ] If you have multiple commits, please combine them into a few logically organized commits by [squashing them](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) - [ ] Internationalization required/considered - [ ] If paid feature, have we considered GitLab.com plan and how it works for groups and is there a design for promoting it to users who aren't on the correct plan - [ ] End-to-end tests pass (`package-and-qa` manual pipeline job) + +/label ~database |