railties 4.1.5 → 4.1.6.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fe78668d2a567954f4203f0a20468ebe873537c
-  data.tar.gz: e8f703fc8b8dee1f696db203a790658a5ed59fd8
+  metadata.gz: dcc8f12b305943d799437f2bd5c6a3dadd55ed2f
+  data.tar.gz: 9ea7cb5d9a06d5b2efb698d66f760487c33906f5
 SHA512:
-  metadata.gz: 223c50286466285dfc883953104ac08dc6ee366e8246e87df89a999677242c85fc99a332587997b8d96df8d8f2cc2b2b3f65ca6e4b1bde7bb16659a92f234e57
-  data.tar.gz: 0dfb3f819badf4391535173628064986e041c18bb4e3d158d5b319f2e5d79fb7ac533cce36d11e1c23bda4f74ae7bf3eb62a403f49a827261a1b74e27951d614
+  metadata.gz: ec9e7dac2f1af356de76e78029d290929659639eaefe42a890a2548b916a083f30ff67e438af11ce0179646bfec5ec5fe475a326f2a88ee89e1896e65c574192
+  data.tar.gz: 8405199c8a6467fa2fd592b00db483b5eacb0860fd42fc5524decc3636d419c46e3c624b70e1d6df9ffe9b1e21bbcbbac2159ba0511ea1ae166ed9255d6616c6

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## Rails 4.1.6 (August 19, 2014) ##
+
+*   Scaffold generator `_form` partial adds `class="field"` for password
+    confirmation fields.
+
+    *noinkling*
+
+*   Avoid namespacing routes inside engines.
+
+    Mountable engines are namespaced by default so the generated routes
+    were too while they should not.
+
+    Fixes #14079.
+
+    *Yves Senn*, *Carlos Antonio da Silva*, *Robin Dupret*
+
+
 ## Rails 4.1.5 (August 18, 2014) ##
 
 *   Check attributes passed to `create_with` and `where`.

data/lib/rails/application.rb

@@ -365,6 +365,10 @@ module Rails
       end
     end
 
+    def migration_railties # :nodoc:
+      (ordered_railties & railties_without_main_app).reverse
+    end
+
   protected
 
     alias :build_middleware_stack :app
@@ -395,6 +399,11 @@ module Rails
       super
     end
 
+    def railties_without_main_app # :nodoc:
+      @railties_without_main_app ||= Rails::Railtie.subclasses.map(&:instance) +
+        Rails::Engine.subclasses.map(&:instance)
+    end
+
     # Returns the ordered railties for this application considering railties_order.
     def ordered_railties #:nodoc:
       @ordered_railties ||= begin

data/lib/rails/gem_version.rb

@@ -7,8 +7,8 @@ module Rails
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 5
-    PRE   = nil
+    TINY  = 6
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/erb/scaffold/templates/_form.html.erb

@@ -17,7 +17,7 @@
     <%%= f.label :password %><br>
     <%%= f.password_field :password %>
   </div>
-  <div>
+  <div class="field">
     <%%= f.label :password_confirmation %><br>
     <%%= f.password_field :password_confirmation %>
 <% else -%>

data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

@@ -33,7 +33,7 @@ Rails.application.configure do
   # Generate digests for assets URLs.
   config.assets.digest = true
 
-  # `config.assets.precompile` has moved to config/initializers/assets.rb
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
   <%- end -%>
 
   # Specifies the header that your server uses for sending files.
@@ -58,12 +58,6 @@ Rails.application.configure do
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
 
-  <%- unless options.skip_sprockets? -%>
-  # Precompile additional assets.
-  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  # config.assets.precompile += %w( search.js )
-  <%- end -%>
-
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false

data/lib/rails/generators/rails/controller/controller_generator.rb

@@ -27,11 +27,11 @@ module Rails
         #   end
         # end
         def generate_routing_code(action)
-          depth = class_path.length
+          depth = regular_class_path.length
           # Create 'namespace' ladder
           # namespace :foo do
           #   namespace :bar do
-          namespace_ladder = class_path.each_with_index.map do |ns, i|
+          namespace_ladder = regular_class_path.each_with_index.map do |ns, i|
             indent("namespace :#{ns} do\n", i * 2)
           end.join
 

data/lib/rails/generators/testing/assertions.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Rails
   module Generators
     module Testing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6.rc1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -349,9 +349,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.3.0