Permalink
Browse files

Merge pull request #14647 from matiaskorhonen/updates-maintenance-policy

Updates the maintenance policy with new Rails versions
Conflicts:
	guides/CHANGELOG.md
  • Loading branch information...
1 parent cf70674 commit ae9fef3b7188dace0f4943fe6a2443904a247043 @rafaelfranca rafaelfranca committed Apr 8, 2014
Showing with 7 additions and 3 deletions.
  1. +4 −0 guides/CHANGELOG.md
  2. +3 −3 guides/source/maintenance_policy.md
View
@@ -1,5 +1,9 @@
## Rails 4.1.0 (April 8, 2014) ##
+* Updates the maintenance policy to match the latest versions of Rails
+
+ *Matias Korhonen*
+
* Fixed missing line and shadow on service pages(404, 422, 500).
*Dmitry Korotkov*
@@ -20,7 +20,7 @@ Only the latest release series will receive bug fixes. When enough bugs are
fixed and its deemed worthy to release a new gem, this is the branch it happens
from.
-**Currently included series:** 4.0.z
+**Currently included series:** 4.1.z, 4.0.z
Security Issues
---------------
@@ -35,7 +35,7 @@ be built from 1.2.2, and then added to the end of 1-2-stable. This means that
security releases are easy to upgrade to if you're running the latest version
of Rails.
-**Currently included series:** 4.0.z, 3.2.z
+**Currently included series:** 4.1.z, 4.0.z
Severe Security Issues
----------------------
@@ -44,7 +44,7 @@ For severe security issues we will provide new versions as above, and also the
last major release series will receive patches and new versions. The
classification of the security issue is judged by the core team.
-**Currently included series:** 4.0.z, 3.2.z
+**Currently included series:** 4.1.z, 4.0.z, 3.2.z
Unsupported Release Series
--------------------------

0 comments on commit ae9fef3

Please sign in to comment.