summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-05-15 10:55:47 +0200
committerRémy Coutable <remy@rymai.me>2018-05-15 10:55:47 +0200
commit3ec91d00e9295aaa7aee5bd58359224b74c5d0a8 (patch)
tree3fd0510a8d5c43af02cece1ec348766183d9f64a /.gitlab
parentdee61df95cc07b6d4e34830a0097034c8995a90a (diff)
downloadgitlab-ce-3ec91d00e9295aaa7aee5bd58359224b74c5d0a8.tar.gz
Improve the squash step in the 'Database Changes' MR template31662-remove-squashed-related-commits-together-from-default-mr-template
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/merge_request_templates/Database Changes.md4
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