summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-08-08 13:17:39 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-08 13:17:39 +0000
commitf2efd892044e8f2d81c9cbf9b6efe2b836b2c95d (patch)
tree07ac2067ecac94b9f94fb27cb02949e5052ac1c2
parentaf9127e0491a284fae82d347ae311b0710e63fff (diff)
parentc78640890cae5ca6f17e75c0e034503ff0de7cc9 (diff)
downloadgitlab-ce-f2efd892044e8f2d81c9cbf9b6efe2b836b2c95d.tar.gz
Merge branch 'add-mr-migration-guidelines' into 'master'
Add migration-related tips to the "Merge Request Guidelines" doc ## Why was this MR needed? To avoid issues like #20606 cropping up again. See merge request !5700
-rw-r--r--CONTRIBUTING.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2f522c1e39a..d94673e82ce 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -336,6 +336,10 @@ request is as follows:
1. If your code creates new files on disk please read the
[shared files guidelines](doc/development/shared_files.md).
1. When writing commit messages please follow [these](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) [guidelines](http://chris.beams.io/posts/git-commit/).
+1. If your merge request adds one or more migrations, make sure to execute all
+ migrations on a fresh database before the MR is reviewed. If the review leads
+ to large changes in the MR, do this again once the review is complete.
+1. For more complex migrations, write tests.
The **official merge window** is in the beginning of the month from the 1st to
the 7th day of the month. This is the best time to submit an MR and get