Update develop-4 references

django-cms · vinitkumar · Mar 3, 2025 · Mar 1, 2025 · Mar 1, 2025 · Mar 1, 2025
commit 09618c4d5afcede6b400cb84a8488fa6073658d6
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,7 +2,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "develop", "develop-4", "release/0.10.x", "release/2.1.x", "release/2.2.x", "release/2.3.x", "release/2.4.x", "release/3.0.x", "release/3.1.x", "release/3.2.x", "release/3.3.x", "release/3.4.x", "release/3.5.x", "release/3.6.x", "release/3.7.x", "release/3.8.x", "release/3.9.x", "release/3.10.x", "release/3.11.x", "release/4.0.x", "release/4.0.0.x", "release/4.0.1.x", "release/4.1.x" ]
+    branches: [ "main", "develop-4", "release/0.10.x", "release/2.1.x", "release/2.2.x", "release/2.3.x", "release/2.4.x", "release/3.0.x", "release/3.1.x", "release/3.2.x", "release/3.3.x", "release/3.4.x", "release/3.5.x", "release/3.6.x", "release/3.7.x", "release/3.8.x", "release/3.9.x", "release/3.10.x", "release/3.11.x", "release/4.0.x", "release/4.0.0.x", "release/4.0.1.x", "release/4.1.x" , "release/5.0.x"]
   pull_request:
     branches: [ "develop" ]
   schedule:

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -18,5 +18,5 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: '👋 Hi there!\n\nPlease remember to **MERGE COMMIT** pull requests from `develop` or `develop-4`!\n\n**Do not SQUASH** commits to preserve history for the changelog.'
+              body: '👋 Hi there!\n\nPlease remember to **MERGE COMMIT** pull requests from `main`!\n\n**Do not SQUASH** commits to preserve history for the changelog.'
             })
diff --git a/README.rst b/README.rst
@@ -22,7 +22,7 @@ Because django CMS is a community-driven project, we welcome everyone to `get in
 
 .. ATTENTION::
 
-    Please use the ``develop-4`` branch as the target for pull requests for on-going development.
+    Please use the ``main`` branch as the target for pull requests for on-going development.
 
     Security fixes will be backported to older branches by the core team as appropriate.
 
@@ -72,7 +72,7 @@ Documentation
 Our documentation working group maintains documentation for several versions of the project. Key versions are:
 
 * `stable <http://docs.django-cms.org>`_ (default), for the **current release** version
-* `latest <http://docs.django-cms.org/en/latest/>`_, representing the latest build of the **develop-4 branch**
+* `latest <http://docs.d
8000
jango-cms.org/en/latest/>`_, representing the latest build of the **main branch**
 
 For more information about our branch policy, see `Branches
 <http://docs.django-cms.org/en/latest/contributing/development-policies.html>`_.

diff --git a/docs/contributing/development-policies.rst b/docs/contributing/development-policies.rst
@@ -106,15 +106,15 @@ Branches
 We maintain a number of branches on
 `our GitHub repository <https://github.com/django-cms/django-cms>`_:
 
-``develop-4``
+``-main``
     The default target branch for on-going development and new pull requests.
 
 ``release/x.y.z`` are the latest released versions of django CMS. Commits
-    are cherry-picked from ``develop-4`` and merged into ``release/x.y.z``
+    are cherry-picked from ``main`` and merged into ``release/x.y.z``
     when suitable. We **officially support** the latest, highest released version
     and the latest LTS.
 
-Please always open PR's against ``develop-4`` and indicate that they should be
+Please always open PR's against ``main`` and indicate that they should be
 backpor
4EF1
ted to the latest LTS release when necessary. Older branches are not
 supported any longer.