railties 3.1.2 → 3.1.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Rails 3.1.3 (unreleased) ##
+
+*   New apps should be generated with a sass-rails dependency of 3.1.5, not 3.1.5.rc.2
+
 ## Rails 3.1.2 (unreleased) ##
 
 *   Engines: don't blow up if db/seeds.rb is missing.

data/guides/source/i18n.textile

@@ -231,7 +231,7 @@ end
 
 Now, when you call the +books_path+ method you should get +"/en/books"+ (for the default locale). An URL like +http://localhost:3001/nl/books+ should load the Netherlands locale, then, and following calls to +books_path+ should return +"/nl/books"+ (because the locale changed).
 
-If you don't want to force the use of a locale in your routes you can use an optional path scope (donated by the use brackets) like so:
+If you don't want to force the use of a locale in your routes you can use an optional path scope (denoted by the parentheses) like so:
 
 <ruby>
 # config/routes.rb

data/lib/rails/generators/app_base.rb

@@ -209,7 +209,7 @@ module Rails
           # Gems used only for assets and not required
           # in production environments by default.
           group :assets do
-            gem 'sass-rails', #{options.dev? || options.edge? ? "  :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : "  '~> 3.1.5.rc.2'"}
+            gem 'sass-rails', #{options.dev? || options.edge? ? "  :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : "  '~> 3.1.5'"}
             gem 'coffee-rails', #{options.dev? || options.edge? ? ":git => 'git://github.com/rails/coffee-rails.git', :branch => '3-1-stable'" : "'~> 3.1.1'"}
             gem 'uglifier', '>= 1.0.3'
           end

data/lib/rails/version.rb

@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 1
-  - 2
-  version: 3.1.2
+  - 3
+  version: 3.1.3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 Z
+date: 2011-11-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -89,12 +89,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
         - 1
-        - 2
-        version: 3.1.2
+        - 3
+        version: 3.1.3
   requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -105,12 +105,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
         - 1
-        - 2
-        version: 3.1.2
+        - 3
+        version: 3.1.3
   requirement: *id006
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."
 email: david@loudthinking.com