aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-11-15 18:55:50 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-11-15 18:55:50 -0800
commit38b312a86f09bcedd597dc9d64db6705650f3216 (patch)
tree227942f7974dfe83775ba48c8cfb71d465e07313 /guides
parentdd184e4b44074a64db27a4ed8c141d26418caef2 (diff)
parent66e44862bd0e74164461f19b967f8f47e69f512c (diff)
downloadrails-38b312a86f09bcedd597dc9d64db6705650f3216.tar.gz
rails-38b312a86f09bcedd597dc9d64db6705650f3216.tar.bz2
rails-38b312a86f09bcedd597dc9d64db6705650f3216.zip
Merge pull request #12907 from JuanitoFatas/upgrading
[ci skip] Update gem versions for 3.2 and 3.1. Also change some words.
Diffstat (limited to 'guides')
-rw-r--r--guides/source/upgrading_ruby_on_rails.md19
1 files changed, 10 insertions, 9 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 224213268e..004d6bd466 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -346,18 +346,19 @@ Upgrading from Rails 3.1 to Rails 3.2
If your application is currently on any version of Rails older than 3.1.x, you should upgrade to Rails 3.1 before attempting an update to Rails 3.2.
-The following changes are meant for upgrading your application to Rails 3.2.12, the latest 3.2.x version of Rails.
+The following changes are meant for upgrading your application to Rails 3.2.15,
+the last 3.2.x version of Rails.
### Gemfile
Make the following changes to your `Gemfile`.
```ruby
-gem 'rails', '= 3.2.12'
+gem 'rails', '3.2.15'
group :assets do
- gem 'sass-rails', '~> 3.2.3'
- gem 'coffee-rails', '~> 3.2.1'
+ gem 'sass-rails', '~> 3.2.6'
+ gem 'coffee-rails', '~> 3.2.2'
gem 'uglifier', '>= 1.0.3'
end
```
@@ -393,21 +394,21 @@ Upgrading from Rails 3.0 to Rails 3.1
If your application is currently on any version of Rails older than 3.0.x, you should upgrade to Rails 3.0 before attempting an update to Rails 3.1.
-The following changes are meant for upgrading your application to Rails 3.1.11, the latest 3.1.x version of Rails.
+The following changes are meant for upgrading your application to Rails 3.1.12, the last 3.1.x version of Rails.
### Gemfile
Make the following changes to your `Gemfile`.
```ruby
-gem 'rails', '= 3.1.11'
+gem 'rails', '3.1.12'
gem 'mysql2'
# Needed for the new asset pipeline
group :assets do
- gem 'sass-rails', "~> 3.1.5"
- gem 'coffee-rails', "~> 3.1.1"
- gem 'uglifier', ">= 1.0.3"
+ gem 'sass-rails', '~> 3.1.7'
+ gem 'coffee-rails', '~> 3.1.1'
+ gem 'uglifier', '>= 1.0.3'
end
# jQuery is the default JavaScript library in Rails 3.1