summaryrefslogtreecommitdiffstats
path: root/CONTRIBUTING.rst
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@constrainttec.com>2018-08-06 11:44:00 (GMT)
committerCraig Scott <craig.scott@constrainttec.com>2018-08-06 12:50:39 (GMT)
commit670324bea29d484287ce0b81fe7cea52ba6e92bd (patch)
tree19357a00b00cb06a7a8253d34ba85f85664b8ad5 /CONTRIBUTING.rst
parentd1d5709503b0917ca0700c386f629d00d92d538e (diff)
downloadCMake-670324bea29d484287ce0b81fe7cea52ba6e92bd.zip
CMake-670324bea29d484287ce0b81fe7cea52ba6e92bd.tar.gz
CMake-670324bea29d484287ce0b81fe7cea52ba6e92bd.tar.bz2
Help: Update maintainer edit checkbox label
Recent GitLab updates have changed the label associated with the checkbox in merge request descriptions for allowing edits from maintainers. Make the contributor guidelines match the new label and add a note for why it is recommended.
Diffstat (limited to 'CONTRIBUTING.rst')
-rw-r--r--CONTRIBUTING.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 9e67703..84f6abb 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -36,7 +36,9 @@ To contribute patches:
#. Push a topic branch to a personal repository fork on GitLab.
#. Create a GitLab Merge Request targeting the upstream ``master`` branch
(even if the change is intended for merge to the ``release`` branch).
- Check the box to allow edits from maintainers.
+ Check the box labelled "Allow commits from members who can merge to the
+ target branch". This will allow maintainers to make minor edits on your
+ behalf.
The merge request will enter the `CMake Review Process`_ for consideration.