[Cmake-commits] CMake branch, master, updated. v3.12.0-380-g6038f07

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  6038f0730a8b043328ad80ed2fdea66604bc6509 (commit)
       via  670324bea29d484287ce0b81fe7cea52ba6e92bd (commit)
      from  1d76991a412873aa3a0aed9735a06d658ef367e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6038f0730a8b043328ad80ed2fdea66604bc6509
commit 6038f0730a8b043328ad80ed2fdea66604bc6509
Merge: 1d76991 670324b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 6 12:52:39 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 6 08:52:45 2018 -0400

    Merge topic 'update_maintainer_edit_label'
    
    670324bea2 Help: Update maintainer edit checkbox label
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2263


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=670324bea29d484287ce0b81fe7cea52ba6e92bd
commit 670324bea29d484287ce0b81fe7cea52ba6e92bd
Author:     Craig Scott <craig.scott at constrainttec.com>
AuthorDate: Mon Aug 6 21:44:00 2018 +1000
Commit:     Craig Scott <craig.scott at constrainttec.com>
CommitDate: Mon Aug 6 22:50:39 2018 +1000

    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.

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.
 

-----------------------------------------------------------------------

Summary of changes:
 CONTRIBUTING.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake