Merge branch 'master' into adequaterecord

* master: (122 commits)
  Rails.application should be set inside before_configuration hook
  remove check for present? from delete_all
  Remove useless begin..end
  Build the reverse_order on its proper method.
  Use connection-specific bytea escaping
  Ignore order when doing count.
  make enums distinct per class
  Remove unused `subclass_controller_with_flash_type_bar` var from flash test.
  fix CollectionProxy delete_all documentation
  Added OS X specific commands to installation guide [ci skip] Recommended using homebrew for installing MySQL and PostgreSQL
  Fix setup of adding _flash_types test.
  Use SVG version of travis build status badge [skip ci]
  W3C CSP document moved to gihub.io URL [ci skip]
  sprockets-rails was released
  Fix the test defining the models in the right place
  Add CHANGELOG entry for #11650 [ci skip]
  Declare the assets dependency
  Use sass-rails 4.0.3
  Make possible to use sprockets-rails 2.1
  add missing parentheses to validates_with documentation [skip ci]
  ...

7 files changed, 41 insertions, 18 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index e37347b576..8d080feb04 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -87,7 +87,7 @@ module Rails
     class << self
       def inherited(base)
         super
-        Rails.application ||= base.instance
+        base.instance
       end
 
       # Makes the +new+ method public.
@@ -117,6 +117,8 @@ module Rails
       @railties          = nil
       @message_verifiers = {}
 
+      Rails.application ||= self
+
       add_lib_to_load_path!
       ActiveSupport.run_load_hooks(:before_configuration, self)
 
@@ -151,14 +153,13 @@ module Rails
     def key_generator
       # number of iterations selected based on consultation with the google security
       # team. Details at https://github.com/rails/rails/pull/6952#issuecomment-7661220
-      @caching_key_generator ||= begin
+      @caching_key_generator ||=
         if secrets.secret_key_base
           key_generator = ActiveSupport::KeyGenerator.new(secrets.secret_key_base, iterations: 1000)
           ActiveSupport::CachingKeyGenerator.new(key_generator)
         else
           ActiveSupport::LegacyKeyGenerator.new(config.secret_token)
         end
-      end
     end
 
     # Returns a message verifier object.
@@ -332,6 +333,25 @@ module Rails
       config.helpers_paths
     end
 
+    console do
+      require "pp"
+    end
+
+    console do
+      unless ::Kernel.private_method_defined?(:y)
+        if RUBY_VERSION >= '2.0'
+          require "psych/y"
+        else
+          module ::Kernel
+            def y(*objects)
+              puts ::Psych.dump_stream(*objects)
+            end
+            private :y
+          end
+        end
+      end
+    end
+
   protected
 
     alias :build_middleware_stack :app
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 9aec2f9734..4c449d2c57 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -95,6 +95,7 @@ module Rails
         yaml = Pathname.new(paths["config/database"].first || "")
 
         config = if yaml.exist?
+          require "yaml"
           require "erb"
           YAML.load(ERB.new(yaml.read).result) || {}
         elsif ENV['DATABASE_URL']
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 5661094d95..b36ab3d0d5 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -429,7 +429,6 @@ module Rails
     # Load console and invoke the registered hooks.
     # Check <tt>Rails::Railtie.console</tt> for more info.
     def load_console(app=self)
-      require "pp"
       require "rails/console/app"
       require "rails/console/helpers"
       run_console_blocks(app)
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index dd1438800c..c066f748ee 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -203,8 +203,7 @@ module Rails
           [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH),
            GemfileEntry.github('arel', 'rails/arel')]
         elsif options.edge?
-          [GemfileEntry.github('rails', 'rails/rails'),
-           GemfileEntry.github('arel', 'rails/arel')]
+          [GemfileEntry.github('rails', 'rails/rails')]
         else
           [GemfileEntry.version('rails',
                             Rails::VERSION::STRING,
@@ -250,7 +249,7 @@ module Rails
                                     'Use SCSS for stylesheets')
         else
           gems << GemfileEntry.version('sass-rails',
-                                     '~> 4.0.2',
+                                     '~> 4.0.3',
                                      'Use SCSS for stylesheets')
         end
 
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
index 7312ddb6cd..71934bb48c 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
@@ -23,8 +23,10 @@ test:
 # Do not keep production credentials in the repository,
 # instead read the configuration from the environment.
 #
-# Example:
-#   sqlite3://myuser:mypass@localhost/full/path/to/somedatabase
+# Examples:
+#   sqlite3::memory:
+#   sqlite3:db/production.sqlite3
+#   sqlite3:/full/path/to/database.sqlite3
 #
 production:
   url: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 8d7e804bdc..2b33beaa2b 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -221,26 +221,28 @@ module Rails
     protected
 
     def run_console_blocks(app) #:nodoc:
-      self.class.console.each { |block| block.call(app) }
+      each_registered_block(:console) { |block| block.call(app) }
     end
 
     def run_generators_blocks(app) #:nodoc:
-      self.class.generators.each { |block| block.call(app) }
+      each_registered_block(:generators) { |block| block.call(app) }
     end
 
     def run_runner_blocks(app) #:nodoc:
-      self.class.runner.each { |block| block.call(app) }
+      each_registered_block(:runner) { |block| block.call(app) }
     end
 
     def run_tasks_blocks(app) #:nodoc:
       extend Rake::DSL
-      self.class.rake_tasks.each { |block| instance_exec(app, &block) }
+      each_registered_block(:rake_tasks) { |block| instance_exec(app, &block) }
+    end
 
-      # Load also tasks from all superclasses
-      klass = self.class.superclass
+    private
 
-      while klass.respond_to?(:rake_tasks)
-        klass.rake_tasks.each { |t| instance_exec(app, &t) }
+    def each_registered_block(type, &block)
+      klass = self.class
+      while klass.respond_to?(type)
+        klass.public_send(type).each(&block)
         klass = klass.superclass
       end
     end
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb
index 75180ff978..878b9b7930 100644
--- a/railties/lib/rails/test_unit/railtie.rb
+++ b/railties/lib/rails/test_unit/railtie.rb
@@ -1,4 +1,4 @@
-if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
+if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^test(?::|$)/).any?
   ENV['RAILS_ENV'] ||= 'test'
 end