summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-01-26 16:00:28 +0000
committerRémy Coutable <remy@rymai.me>2017-01-26 16:00:28 +0000
commit5a6ab1d0facfd9dfd570d5206ff209ce0a4be483 (patch)
treeb3abfd0ca10aa50d0d8372bc2de402460ec71be1
parent73c54366e64b6c4fc9b652fea6fa1911c19d8316 (diff)
parente9b071e5dba26868295c5f7f58ea41c3d43a072c (diff)
downloadgitlab-ce-5a6ab1d0facfd9dfd570d5206ff209ce0a4be483.tar.gz
Merge branch 'official-merge-window-contributing-md' into 'master'
Remove "official merge window" from CONTRIBUTING.md [ci skip] See merge request !8816
-rw-r--r--CONTRIBUTING.md8
1 files changed, 0 insertions, 8 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1eaa32de27f..d404f1b91df 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -286,14 +286,6 @@ request is as follows:
1. For tests that use Capybara or PhantomJS, see this [article on how
to write reliable asynchronous tests](https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara).
-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
-feedback fast. Before this time the GitLab Inc. team is still dealing with work
-that is created by the monthly release such as regressions requiring patch
-releases. After the 7th it is already getting closer to the release date of the
-next version. This means there is less time to fix the issues created by
-merging large new features.
-
Please keep the change in a single MR **as small as possible**. If you want to
contribute a large feature think very hard what the minimum viable change is.
Can you split the functionality? Can you only submit the backend/API code? Can