railties 3.2.6 → 3.2.7.rc1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 3.2.7 (unreleased)
+
+* Since Rails 3.2, use layout false to render no layout
+* Use strict_args_position! if available from Thor
+
 ## Rails 3.2.6 (Jun 12, 2012)
 
 *   No changes.

data/guides/source/contributing_to_ruby_on_rails.textile

@@ -307,16 +307,16 @@ h4. Follow the Coding Conventions
 
 Rails follows a simple set of coding style conventions.
 
-* Two spaces, no tabs.
-* No trailing whitespace. Blank lines should not have any space.
-* Do not indent after private/protected. Private/protected should have the same indentation as the methods around.
+* Two spaces, no tabs (for indentation).
+* No trailing whitespace. Blank lines should not have any spaces.
+* Indent after private/protected.
 * Prefer +&&+/+||+ over +and+/+or+.
-* Prefer class << self block over self.method for class methods.
-* +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+.
-* a = b and not a=b.
-* Follow the conventions you see used in the source already.
+* Prefer class << self over self.method for class methods.
+* Use +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+.
+* Use a = b and not a=b.
+* Follow the conventions in the source you see used already.
 
-These are some guidelines and please use your best judgment in using them.
+The above are guidelines -- please use your best judgment in using them.
 
 h4. Sanity Check
 

data/guides/source/layouts_and_rendering.textile

@@ -445,7 +445,7 @@ end
 
 <ruby>
 class OldPostsController < SpecialPostsController
-  layout nil
+  layout false
 
   def show
     @post = Post.find(params[:id])

data/lib/rails/generators/base.rb

@@ -20,6 +20,7 @@ module Rails
       include Rails::Generators::Actions
 
       add_runtime_options!
+      strict_args_position! if respond_to?(:strict_args_position!)
 
       # Returns the source root for this generator using default_source_root as default.
       def self.source_root(path=nil)

data/lib/rails/version.rb

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

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: -3026603520
+  prerelease: 6
   segments: 
   - 3
   - 2
-  - 6
-  version: 3.2.6
+  - 7
+  - rc
+  - 1
+  version: 3.2.7.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-12 00:00:00 Z
+date: 2012-07-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -95,12 +97,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: -3026603520
         segments: 
         - 3
         - 2
-        - 6
-        version: 3.2.6
+        - 7
+        - rc
+        - 1
+        version: 3.2.7.rc1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -111,12 +115,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: -3026603520
         segments: 
         - 3
         - 2
-        - 6
-        version: 3.2.6
+        - 7
+        - rc
+        - 1
+        version: 3.2.7.rc1
   type: :runtime
   version_requirements: *id006
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."
@@ -644,12 +650,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: