summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.rst
diff options
context:
space:
mode:
Diffstat (limited to 'CONTRIBUTING.rst')
-rw-r--r--CONTRIBUTING.rst14
1 files changed, 8 insertions, 6 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 14774d0..aac2b91 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -39,8 +39,8 @@ Handbook_.
.. _Handbook: https://help.adelielinux.org/html/devel/
-GitLab Pull Requests
-````````````````````
+GitLab Merge Requests
+`````````````````````
#. If you do not already have a GitLab account, you must create one.
@@ -60,13 +60,17 @@ GitLab Pull Requests
#. Visit your forked repository in a Web browser.
-#. Choose the *Create Pull Request* button.
+#. Choose the *Create Merge Request* button.
#. Review your changes to ensure they are correct, and then submit the form.
Mailing List
````````````
+.. warning:: There is no Horizon mailing list right now. We are working to
+ create a new mailing list. Until then, GitLab merge requests
+ are the only supported contribution method. We apologise for
+ the inconvenience.
#. Clone the Horizon repository to your computer.
@@ -87,6 +91,4 @@ Mailing List
``git format-patch HEAD^^^``.
#. Email the resulting patch to the mailing list, using ``git send-email`` or
- your mail client. Ensure you are subscribed_ first.
-
-.. _subscribed: https://lists.adelielinux.org/postorius/lists/horizon.lists.adelielinux.org/
+ your mail client. Ensure you are subscribed first.