aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/upgrading_ruby_on_rails.md
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-11-28 10:54:46 +0100
committerYves Senn <yves.senn@gmail.com>2013-11-28 15:43:28 +0100
commit9bb173cb3433c1b98161fa76dd40d8508f0ac8f0 (patch)
tree4c33dc9a93e4cda3c33599d918265f2c2eb6c64c /guides/source/upgrading_ruby_on_rails.md
parent0173e149b06d69408c98a1a6a1e311ff1929159e (diff)
downloadrails-9bb173cb3433c1b98161fa76dd40d8508f0ac8f0.tar.gz
rails-9bb173cb3433c1b98161fa76dd40d8508f0ac8f0.tar.bz2
rails-9bb173cb3433c1b98161fa76dd40d8508f0ac8f0.zip
move "HTTP PATCH" paragraph into "Upgrading 3.2 -> 4.0". [ci skip]
Diffstat (limited to 'guides/source/upgrading_ruby_on_rails.md')
-rw-r--r--guides/source/upgrading_ruby_on_rails.md18
1 files changed, 9 insertions, 9 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 004d6bd466..d26ebd1a23 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -22,6 +22,15 @@ Rails generally stays close to the latest released Ruby version when it's releas
TIP: Ruby 1.8.7 p248 and p249 have marshaling bugs that crash Rails. Ruby Enterprise Edition has these fixed since the release of 1.8.7-2010.02. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults, so if you want to use 1.9.x, jump straight to 1.9.3 for smooth sailing.
+Upgrading from Rails 3.2 to Rails 4.0
+-------------------------------------
+
+NOTE: This section is a work in progress.
+
+If your application is currently on any version of Rails older than 3.2.x, you should upgrade to Rails 3.2 before attempting one to Rails 4.0.
+
+The following changes are meant for upgrading your application to Rails 4.0.
+
### HTTP PATCH
Rails 4 now uses `PATCH` as the primary HTTP verb for updates when a RESTful
@@ -120,15 +129,6 @@ Ruby libraries yet. Aaron Patterson's
[hana](https://github.com/tenderlove/hana) is one such gem, but doesn't have
full support for the last few changes in the specification.
-Upgrading from Rails 3.2 to Rails 4.0
--------------------------------------
-
-NOTE: This section is a work in progress.
-
-If your application is currently on any version of Rails older than 3.2.x, you should upgrade to Rails 3.2 before attempting one to Rails 4.0.
-
-The following changes are meant for upgrading your application to Rails 4.0.
-
### Gemfile
Rails 4.0 removed the `assets` group from Gemfile. You'd need to remove that