summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2014-12-11 12:44:36 +0000
committerSytse Sijbrandij <sytse@gitlab.com>2014-12-11 12:44:36 +0000
commitfeb7c2bcce9c948377e135c33f9760cb79c3822c (patch)
tree966276d13159436d76aed2f103ae52de31d5eb18
parent9c9dc64a40d0a3c9e7265436e82dbe055320be97 (diff)
parent0ff2c67d4be386907cf4d84f3cb3eba5ef284290 (diff)
downloadgitlab-ce-feb7c2bcce9c948377e135c33f9760cb79c3822c.tar.gz
Merge branch 'contributing-md-file-read' into 'master'
Add an extra reference to the 'shell commands' guide The 'shell commands' guide now also has tips on opening/reading files and handling paths. See merge request !1321
-rw-r--r--CONTRIBUTING.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 06897eec839..2195ea6e739 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -75,6 +75,7 @@ If you can, please submit a merge request with the fix or improvements including
1. Link relevant [issues](https://gitlab.com/gitlab-org/gitlab-ce/issues) and/or [feature requests](http://feedback.gitlab.com/) from the merge request description and leave a comment on them with a link back to the MR
1. Be prepared to answer questions and incorporate feedback even if requests for this arrive weeks or months after your MR submission
1. If your MR touches code that executes shell commands, make sure it adheres to the [shell command guidelines]( doc/development/shell_commands.md).
+1. Also have a look at the [shell command guidelines](doc/development/shell_commands.md) if your code reads or opens files, or handles paths to files on disk.
The **official merge window** is in the beginning of the month from the 1st to the 7th day of the month. The best time to submit a MR and get feedback fast. Before this time the GitLab B.V. team is still dealing with work that is created by the monthly release such as assisting subscribers with upgrade issues, the release of Enterprise Edition and the upgrade of GitLab Cloud. 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.