Skip to content

Commit c5aea50

Browse files
zero-24zero-24
committed
Update branches and fix some references still pointing to staging
1 parent c764d4d commit c5aea50

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎.drone.jsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ local pipeline(phpversion, ignore_result) = {
167167
image: "rips/rips-cli:3.2.2",
168168
when: {
169169
repo: ["joomla/joomla-cms", "joomla/cms-security"],
170-
branch: ["staging"]
170+
branch: ["3.10-dev"]
171171
},
172172
commands: [
173173
"export RIPS_BASE_URI='https://api.rips.joomla.org'",

‎.github/CONTRIBUTING.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ You are welcome to submit a contribution for review and possible inclusion in th
66

77
2) Follow the [Joomla! Coding Standards](https://developer.joomla.org/coding-standards.html).
88

9-
3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible.
9+
3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible.
1010
If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission.
1111

1212
4) Report security issues to the Joomla! Security Strike Team (JSST) at security@joomla.org or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues.
1313

1414
Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
1515

1616
#### Branches
17-
PRs should usually be made to the `staging` branch as this contains the most recent version of the code.
17+
PRs should usually be made to the `4.0-dev` branch as this contains the most recent version of the code.
1818
There are other branches available which serve specific purposes.
1919

2020
| Branch | Purpose |
2121
| ------ | ------- |
22-
| staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. The 3.9.0 release will include the Privacy Tools Suite features. |
23-
| 3.10-dev | Branch for the next minor Joomla version. The 3.10.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
24-
| 4.0-dev | Branch for the next major Joomla version. New features go into this branch. Commits to staging will be applied to this branch as well. |
22+
| 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will only include compatibility features for 4.x as well as bugfixes and security patches. |
23+
| 4.0-dev | Branch for the Joomla 4.0 series. Commits to 3.10-dev will be applied to this branch as well. |
24+
| 4.1-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.0-dev will be applied to this branch as well. |

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ Build Status
55
---------------------
66
| Drone-CI | AppVeyor |
77
| ------------- | ------------- |
8-
| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/staging?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) |
8+
| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/3.10-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) |
99

1010
What is this?
1111
---------------------
1212
* This is a Joomla! 3.x installation/upgrade package.
1313
* Joomla's [Official website](https://www.joomla.org).
1414
* Joomla! 3.10 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.10_version_history).
15-
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/staging).
15+
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/3.10-dev).
1616

1717
What is Joomla?
1818
---------------------

‎README.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* This is a Joomla! installation/upgrade package to version 3.x
33
* Joomla! Official site: https://www.joomla.org
44
* Joomla! 3.10 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.10_version_history
5-
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/staging
5+
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/3.10-dev
66

77
2- What is Joomla?
88
* Joomla! is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.

0 commit comments

Comments
 (0)