8 files changed, 49 insertions, 332 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index bb3cc1760e..18f2546c73 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,312 +1 @@
-*   Do not crash when `config/secrets.yml` is empty.
-
-    *Yves Senn*
-
-*   Set `dump_schema_after_migration` config values in production.
-
-    Set `config.active_record.dump_schema_after_migration` as false
-    in the generated `config/environments/production.rb` file.
-
-    *Emil Soman*
-
-*   Added Thor-action for creation of migrations.
-
-    Fixes #13588, #12674.
-
-    *Gert Goet*
-
-*   Ensure that `bin/rails` is a file before trying to execute it.
-
-    Fixes #13825.
-
-    *bronzle*
-
-*   Use single quotes in generated files.
-
-    *Cristian Mircea Messel*, *Chulki Lee*
-
-*   The `Gemfile` of new applications depends on SDoc ~> 0.4.0.
-
-    *Xavier Noria*
-
-*   `test_help.rb` now automatically checks/maintains your test database
-    schema. (Use `config.active_record.maintain_test_schema = false` to
-    disable.)
-
-    *Jon Leighton*
-
-*   Configure `secrets.yml` and `database.yml` to read configuration
-    from the system environment by default for production.
-
-    *José Valim*
-
-*   `config.assets.raise_runtime_errors` is set to true by default
-
-    This option has been introduced in
-    [sprockets-rails#100][https://github.com/rails/sprockets-rails/pull/100]
-    and defaults to true in new applications in development.
-
-    *Richard Schneeman*
-
-*   Generates `html` and `text` templates for mailers by default.
-
-    *Kassio Borges*
-
-*   Move `secret_key_base` from `config/initializers/secret_token.rb`
-    to `config/secrets.yml`.
-
-    `secret_key_base` is now saved in `Rails.application.secrets.secret_key_base`
-    and it fallbacks to the value of `config.secret_key_base` when it is not
-    present in `config/secrets.yml`.
-
-    `config/initializers/secret_token.rb` is not generated by default
-    in new applications.
-
-    *Guillermo Iguaran*
-
-*   Generate a new `secrets.yml` file in the `config` folder for new
-    applications. By default, this file contains the application's `secret_key_base`,
-    but it could also be used to store other secrets such as access keys for external
-    APIs.
-
-    The secrets added to this file will be accessible via `Rails.application.secrets`.
-    For example, with the following `secrets.yml`:
-
-        development:
-          secret_key_base: 3b7cd727ee24e8444053437c36cc66c3
-          some_api_key: SOMEKEY
-
-    `Rails.application.secrets.some_api_key` will return `SOMEKEY` in the development
-    environment.
-
-    *Guillermo Iguaran*
-
-*   Add `ENV['DATABASE_URL']` support in `rails dbconsole`. Fixes #13320.
-
-    *Huiming Teo*
-
-*   Add `Application#message_verifier` method to return a message verifier.
-
-    This verifier can be used to generate and verify signed messages in the application.
-
-        message = Rails.application.message_verifier(:sensitive_data).generate('my sensible data')
-        Rails.application.message_verifier(:sensitive_data).verify(message)
-        # => 'my sensible data'
-
-    It is recommended not to use the same verifier for different things, so you can get different
-    verifiers passing the name argument.
-
-        message = Rails.application.message_verifier(:cookies).generate('my sensible cookie data')
-
-    See the `ActiveSupport::MessageVerifier` documentation for more information.
-
-    *Rafael Mendonça França*
-
-*   The [Spring application
-    preloader](https://github.com/rails/spring) is now installed
-    by default for new applications. It uses the development group of
-    the Gemfile, so will not be installed in production.
-
-    *Jon Leighton*
-
-*   Uses .railsrc while creating new plugin if it is available.
-    Fixes #10700.
-
-    *Prathamesh Sonpatki*
-
-*   Remove turbolinks when generating a new application based on a template that skips it.
-
-    Example:
-
-        Skips turbolinks adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }`
-        to the template.
-
-    *Lauro Caetano*
-
-*   Instrument an `load_config_initializer.railties` event on each load of configuration initializer
-    from `config/initializers`. Subscribers should be attached before `load_config_initializers`
-    initializer completed.
-
-    Registering subscriber examples:
-
-        # config/application.rb
-        module RailsApp
-          class Application < Rails::Application
-            ActiveSupport::Notifications.subscribe('load_config_initializer.railties') do |*args|
-              event = ActiveSupport::Notifications::Event.new(*args)
-              puts "Loaded initializer #{event.payload[:initializer]} (#{event.duration}ms)"
-            end
-          end
-        end
-
-        # my_engine/lib/my_engine/engine.rb
-        module MyEngine
-          class Engine < ::Rails::Engine
-            config.before_initialize do
-              ActiveSupport::Notifications.subscribe('load_config_initializer.railties') do |*args|
-                event = ActiveSupport::Notifications::Event.new(*args)
-                puts "Loaded initializer #{event.payload[:initializer]} (#{event.duration}ms)"
-              end
-            end
-          end
-        end
-
-    *Paul Nikitochkin*
-
-*   Support for Pathnames in eager load paths.
-
-    *Mike Pack*
-
-*   Fixed missing line and shadow on service pages(404, 422, 500).
-
-    *Dmitry Korotkov*
-
-*   `BACKTRACE` environment variable to show unfiltered backtraces for
-    test failures.
-
-    Example:
-
-        $ BACKTRACE=1 ruby -Itest ...
-        # or with rake
-        $ BACKTRACE=1 bin/rake
-
-    *Yves Senn*
-
-*   Removal of all javascript stuff (gems and files) when generating a new
-    application using the `--skip-javascript` option.
-
-    *Robin Dupret*
-
-*   Make the application name snake cased when it contains spaces
-
-    The application name is used to fill the `database.yml` and
-    `session_store.rb` files ; previously, if the provided name
-    contained whitespaces, it led to unexpected names in these files.
-
-    *Robin Dupret*
-
-*   Added `--model-name` option to `ScaffoldControllerGenerator`.
-
-    *yalab*
-
-*   Expose MiddlewareStack#unshift to environment configuration.
-
-    *Ben Pickles*
-
-*   `rails server` will only extend the logger to output to STDOUT
-     in development environment.
-
-    *Richard Schneeman*
-
-*   Don't require passing path to app before options in `rails new`
-    and `rails plugin new`
-
-    *Piotr Sarnacki*
-
-*   rake notes now searches *.less files
-
-    *Josh Crowder*
-
-*   Generate nested route for namespaced controller generated using
-    `rails g controller`.
-    Fixes #11532.
-
-    Example:
-
-        rails g controller admin/dashboard index
-
-        # Before:
-        get "dashboard/index"
-
-        # After:
-        namespace :admin do
-          get "dashboard/index"
-        end
-
-    *Prathamesh Sonpatki*
-
-*   Fix the event name of action_dispatch requests.
-
-    *Rafael Mendonça França*
-
-*   Make `config.log_level` work with custom loggers.
-
-    *Max Shytikov*
-
-*   Changed stylesheet load order in the stylesheet manifest generator.
-    Fixes #11639.
-
-    *Pawel Janiak*
-
-*   Added generated unit test for generator generator using new
-    `test:generators` rake task.
-
-    *Josef Šimánek*
-
-*   Removed `update:application_controller` rake task.
-
-    *Josef Šimánek*
-
-*   Fix `rake environment` to do not eager load modules
-
-    *Paul Nikitochkin*
-
-*   Fix `rake notes` to look into `*.sass` files
-
-    *Yuri Artemev*
-
-*   Removed deprecated `Rails.application.railties.engines`.
-
-    *Arun Agrawal*
-
-*   Removed deprecated threadsafe! from Rails Config.
-
-    *Paul Nikitochkin*
-
-*   Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attributes` in
-    favor of `ActiveRecord::Generators::ActiveModel#update`.
-
-    *Vipul A M*
-
-*   Remove deprecated `config.whiny_nils` option.
-
-    *Vipul A M*
-
-*   Rename `commands/plugin_new.rb` to `commands/plugin.rb` and fix references
-
-    *Richard Schneeman*
-
-*   Fix `rails plugin --help` command.
-
-    *Richard Schneeman*
-
-*   Omit turbolinks configuration completely on skip_javascript generator option.
-
-    *Nikita Fedyashev*
-
-*   Removed deprecated rake tasks for running tests: `rake test:uncommitted` and
-    `rake test:recent`.
-
-    *John Wang*
-
-*   Clearing autoloaded constants triggers routes reloading.
-    Fixes #10685.
-
-    *Xavier Noria*
-
-*   Fixes bug with scaffold generator with `--assets=false --resource-route=false`.
-    Fixes #9525.
-
-    *Arun Agrawal*
-
-*   Rails::Railtie no longer forces the Rails::Configurable module on everything
-    that subclasses it. Instead, the methods from Rails::Configurable have been
-    moved to class methods in Railtie and the Railtie has been made abstract.
-
-    *John Wang*
-
-*   Changes repetitive th tags to use colspan attribute in `index.html.erb` template.
-
-    *Sıtkı Bağdat*
-
-Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/railties/CHANGELOG.md) for previous changes.
+Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/railties/CHANGELOG.md) for previous changes.
diff --git a/railties/lib/rails/generators/model_helpers.rb b/railties/lib/rails/generators/model_helpers.rb
new file mode 100644
index 0000000000..c4f45d344b
--- /dev/null
+++ b/railties/lib/rails/generators/model_helpers.rb
@@ -0,0 +1,28 @@
+require 'rails/generators/active_model'
+
+module Rails
+  module Generators
+    module ModelHelpers # :nodoc:
+      PLURAL_MODEL_NAME_WARN_MESSAGE = "The model name '%s' was recognized as a plural, using the singular '%s'. " \
+                                       "Override with --force-plural or setup custom inflection rules for this noun before running the generator."
+      mattr_accessor :skip_warn
+
+      def self.included(base) #:nodoc:
+        base.class_option :force_plural, type: :boolean, default: false, desc: 'Forces the use of the given model name'
+      end
+
+      def initialize(args, *_options)
+        super
+        if name == name.pluralize && name.singularize != name.pluralize && !options[:force_plural]
+          singular = name.singularize
+          unless ModelHelpers.skip_warn
+            say PLURAL_MODEL_NAME_WARN_MESSAGE % [name, singular]
+            ModelHelpers.skip_warn = true
+          end
+          name.replace singular
+          assign_names!(name)
+        end
+      end
+    end
+  end
+end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index d9cc60d656..b789ed9a94 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -35,6 +35,10 @@ Rails.application.configure do
 
   # Version of your assets, change this if you want to expire all your assets.
   config.assets.version = '1.0'
+
+  # 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 -%>
 
   # Specifies the header that your server uses for sending files.
@@ -59,12 +63,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
diff --git a/railties/lib/rails/generators/rails/model/model_generator.rb b/railties/lib/rails/generators/rails/model/model_generator.rb
index ea3d69d7c9..87bab129bb 100644
--- a/railties/lib/rails/generators/rails/model/model_generator.rb
+++ b/railties/lib/rails/generators/rails/model/model_generator.rb
@@ -1,6 +1,10 @@
+require 'rails/generators/model_helpers'
+
 module Rails
   module Generators
     class ModelGenerator < NamedBase # :nodoc:
+      include Rails::Generators::ModelHelpers
+
       argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
       hook_for :orm, required: true
     end
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index 7329ee9f48..4669935156 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -1,14 +1,14 @@
 require 'rails/generators/active_model'
+require 'rails/generators/model_helpers'
 
 module Rails
   module Generators
     # Deal with controller names on scaffold and add some helpers to deal with
     # ActiveModel.
     module ResourceHelpers # :nodoc:
-      mattr_accessor :skip_warn
 
       def self.included(base) #:nodoc:
-        base.class_option :force_plural, type: :boolean, desc: "Forces the use of a plural ModelName"
+        base.send :include, Rails::Generators::ModelHelpers
         base.class_option :model_name, type: :string, desc: "ModelName to be used"
       end
 
@@ -21,15 +21,6 @@ module Rails
           assign_names!(self.name)
         end
 
-        if name == name.pluralize && name.singularize != name.pluralize && !options[:force_plural]
-          unless ResourceHelpers.skip_warn
-            say "Plural version of the model detected, using singularized version. Override with --force-plural."
-            ResourceHelpers.skip_warn = true
-          end
-          name.replace name.singularize
-          assign_names!(name)
-        end
-
         assign_controller_names!(controller_name.pluralize)
       end
 
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index e4fd798d18..79313c936a 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -1,9 +1,9 @@
 module Rails
   module VERSION
     MAJOR = 4
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
-    PRE   = "beta2"
+    PRE   = "alpha"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index 01ab77ee20..bdf51b457c 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -34,6 +34,13 @@ class ModelGeneratorTest < Rails::Generators::TestCase
     assert_no_migration "db/migrate/create_accounts.rb"
   end
 
+  def test_plural_names_are_singularized
+    content = run_generator ["accounts".freeze]
+    assert_file "app/models/account.rb", /class Account < ActiveRecord::Base/
+    assert_file "test/models/account_test.rb", /class AccountTest/
+    assert_match(/The model name 'accounts' was recognized as a plural, using the singular 'account'\. Override with --force-plural or setup custom inflection rules for this noun before running the generator\./, content)
+  end
+
   def test_model_with_underscored_parent_option
     run_generator ["account", "--parent", "admin/account"]
     assert_file "app/models/account.rb", /class Account < Admin::Account/
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb
index 3d4e694361..55c8d92ee8 100644
--- a/railties/test/generators/resource_generator_test.rb
+++ b/railties/test/generators/resource_generator_test.rb
@@ -63,7 +63,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
     content = run_generator ["accounts".freeze]
     assert_file "app/models/account.rb", /class Account < ActiveRecord::Base/
     assert_file "test/models/account_test.rb", /class AccountTest/
-    assert_match(/Plural version of the model detected, using singularized version. Override with --force-plural./, content)
+    assert_match(/The model name 'accounts' was recognized as a plural, using the singular 'account'\. Override with --force-plural or setup custom inflection rules for this noun before running the generator\./, content)
   end
 
   def test_plural_names_can_be_forced