]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
CONTRIBUTING.md: creation of "confidential" merge requests added
authorRalf Habacker <ralf.habacker@freenet.de>
Thu, 17 Feb 2022 10:10:00 +0000 (11:10 +0100)
committerSimon McVittie <smcv@collabora.com>
Mon, 21 Feb 2022 13:54:38 +0000 (13:54 +0000)
See #368

CONTRIBUTING.md

index ba428928c53f92509e493931efbb17cda51c26c6..d141fb8b256d86a0a19d0b55084154c8ee15531a 100644 (file)
@@ -17,6 +17,8 @@ please report it privately to dbus-security@lists.freedesktop.org
 or by reporting a Gitlab issue at
 https://gitlab.freedesktop.org/dbus/dbus/issues/new and marking it
 as "confidential".
+For appropriate patches, please create a "confidential" merge request,
+see [Sending a merge request](#sending-a-merge-request] for details.
 
 ## Mailing list
 
@@ -122,6 +124,9 @@ When you consider your changes to be ready for merging to mainline:
 * push your changes to your personal fork as a branch
 * create a merge request at
   <https://gitlab.freedesktop.org/dbus/dbus/merge_requests>
+* Merge requests for "confidential" issues must also be created as
+  "confidential", see <https://docs.gitlab.com/ee/user/project/merge_requests/confidential.html>
+  for details.
 
 ### Security guidelines