[Documentation] Update release cycle and PR template (#16179)

| Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.12 | Bug fix? | no | | New feature? | no | | BC breaks? | no | | Deprecations? | no | | Related tickets | | | License | MIT |
Sylius · Apr 27, 2024 · 3eb3239 · 3eb3239
2 parents e66acbd + f7ba654
commit 3eb3239
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,16 +1,17 @@
-| Q               | A                                                            |
-|-----------------|--------------------------------------------------------------|
-| Branch?         | 1.12 or 1.13 <!-- see the comment below -->                  |
-| Bug fix?        | no/yes                                                       |
-| New feature?    | no/yes                                                       |
-| BC breaks?      | no/yes                                                       |
-| Deprecations?   | no/yes <!-- don't forget to update the UPGRADE-*.md file --> |
-| Related tickets | fixes #X, partially #Y, mentioned in #Z                      |
-| License         | MIT                                                          |
+| Q               | A
+|-----------------|-----
+| Branch?         | 1.12, 1.13, 1.14 or 2.0 <!-- see the comment below -->
+| Bug fix?        | no/yes
+| New feature?    | no/yes
+| BC breaks?      | no/yes
+| Deprecations?   | no/yes <!-- don't forget to update the UPGRADE-*.md file -->
+| Related tickets | fixes #X, partially #Y, mentioned in #Z
+| License         | MIT
 
 <!--
- - Bug fixes must be submitted against the 1.12 branch
- - Features and deprecations must be submitted against the 1.13 branch
+ - Bug fixes must be submitted against the 1.12 or 1.13 branches
+ - Features and deprecations must be submitted against the 1.14 branch
+ - Features, removing deprecations and BC breaks must be submitted against the 2.0 branch
  - Make sure that the correct base branch is set
 
  To be sure you are not breaking any Backward Compatibilities, check the documentation:

diff --git a/docs/book/organization/release-cycle.rst b/docs/book/organization/release-cycle.rst
@@ -47,23 +47,21 @@ Maintenance
 Each minor Sylius version is maintained for a fixed period of time after its release.
 This maintenance is divided into:
 
-* *Bug fixes and security fixes*: During this period, being *eight months* long,
-  all issues can be fixed. The end of this period is referenced as being the
-  *end of maintenance* of a release.
+* *Bug fixes and security fixes*: During this period all issues can be fixed.
+  The end of this period is referenced as being the *end of maintenance* of a release.
 
-* *Security fixes only*: During this period, being *sixteen months* long,
-  only security related issues can be fixed. The end of this period is referenced
-  as being the *end of life* of a release.
+* *Security fixes only*: During this period, only security related issues can be fixed.
+  The end of this period is referenced as being the *end of life* of a release.
 
-Future release
---------------
+Planned releases
+----------------
 
 +---------+----------------------+------------------------+--------------------+
 | Version | Development starts   | Stabilization starts   | Release date       |
 +=========+======================+========================+====================+
 | 2.0     | Sep 15, 2023         | Q2 2024                | Q3 2024            |
 +---------+----------------------+------------------------+--------------------+
-| 1.13    | Oct 31, 2022         | Feb 15, 2024           | Apr 23, 2024       |
+| 1.14    | Apr 26, 2024         | Q2 2024                | Q3 2024            |
 +---------+----------------------+------------------------+--------------------+
 
 Supported versions
@@ -72,6 +70,8 @@ Supported versions
 +---------+--------------------+--------------------+--------------------+-----------------------+
 | Version | Release date       | End of maintenance | End of life        | Status                |
 +=========+====================+====================+====================+=======================+
+| 1.13    | Apr 23, 2024       | Oct 23, 2024       | Apr 23, 2025       | Fully supported       |
++---------+--------------------+--------------------+--------------------+-----------------------+
 | 1.12    | Oct 31, 2022       | Jun 30, 2024       | Dec 31, 2024       | Fully supported       |
 +---------+--------------------+--------------------+--------------------+-----------------------+
 

diff --git a/features/order/managing_orders/order_filtration/filtering_orders_by_variants.feature b/features/order/managing_orders/order_filtration/filtering_orders_by_variants.feature
@@ -34,7 +34,7 @@ Feature: Filtering orders by variants
         And I should see an order with "#0000002" number
         And I should see an order with "#0000003" number
 
-    @ui @javascript
+    @ui @mink:chromedriver
     Scenario: Filtering orders by multiple variants of the same product
         When I browse orders
         And I filter by variants "Nebula Top" and "Neutron Sleeveless"

diff --git a/features/taxonomy/managing_taxons/reordering_taxon.feature b/features/taxonomy/managing_taxons/reordering_taxon.feature
@@ -24,14 +24,14 @@ Feature: Reordering taxons
         And I should see the taxon named "Watches" in the list
         But the first taxon on the list should be "Watches"
 
-    @ui @javascript
+    @ui @mink:chromedriver
     Scenario: Moving up the first taxon on list
         When I want to see all taxons in store
         And I move up "T-Shirts" taxon
         Then I should see 4 taxons on the list
         And the first taxon on the list should be "T-Shirts"
 
-    @ui @javascript
+    @ui @mink:chromedriver
     Scenario: Moving down the last taxon on list
         When I want to see all taxons in store
         And I move down "Wallets" taxon