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 bf5b56b1a9fdf8e7edd4dcbcf77117bcf3ae4a6f (commit)
via fc7e1de188d0b55b8838132e15fd1ba7ded3bc75 (commit)
from 4984d8433edb05eac446542b561a31edf7a25783 (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=bf5b56b1a9fdf8e7edd4dcbcf77117bcf3ae4a6f
commit bf5b56b1a9fdf8e7edd4dcbcf77117bcf3ae4a6f
Merge: 4984d84 fc7e1de
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Thu Apr 12 21:48:15 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Apr 12 17:48:36 2018 -0400
Merge topic 'doc-dev-mr-edit'
fc7e1de188 CONTRIBUTING: Mention GitLab option to allow edits from
maintainers
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1954
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc7e1de188d0b55b8838132e15fd1ba7ded3bc75
commit fc7e1de188d0b55b8838132e15fd1ba7ded3bc75
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Apr 12 13:16:28 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Apr 12 13:16:38 2018 -0400
CONTRIBUTING: Mention GitLab option to allow edits from maintainers
Collaboration between contributors and developers is easier if a
developer can push an update to a contributor's MR source branch.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index fa2c23d..01987be 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -36,6 +36,7 @@ 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.
The merge request will enter the `CMake Review Process`_ for consideration.
-----------------------------------------------------------------------
Summary of changes:
CONTRIBUTING.rst | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
