4 files changed, 7 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index b1b169ae2f..65c91855da 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -302,7 +302,7 @@ db_namespace = namespace :db do
     end
 
     desc "Recreates the databases from the structure.sql file"
-    task :load => [:environment, :load_config] do
+    task :load => [:environment, :load_config, :check_protected_environments] do
       ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:sql, ENV['SCHEMA'])
     end
 
diff --git a/guides/source/action_cable_overview.md b/guides/source/action_cable_overview.md
index 28578b3369..d1f17fdce5 100644
--- a/guides/source/action_cable_overview.md
+++ b/guides/source/action_cable_overview.md
@@ -106,11 +106,11 @@ Then you would create your own channel classes. For example, you could have a
 **ChatChannel** and an **AppearanceChannel**:
 
 ```ruby
-# app/channels/application_cable/chat_channel.rb
+# app/channels/chat_channel.rb
 class ChatChannel < ApplicationCable::Channel
 end
 
-# app/channels/application_cable/appearance_channel.rb
+# app/channels/appearance_channel.rb
 class AppearanceChannel < ApplicationCable::Channel
 end
 ```
@@ -125,7 +125,7 @@ Incoming messages are then routed to these channel subscriptions based on
 an identifier sent by the cable consumer.
 
 ```ruby
-# app/channels/application_cable/chat_channel.rb
+# app/channels/chat_channel.rb
 class ChatChannel < ApplicationCable::Channel
   # Called when the consumer has successfully become a subscriber of this channel
   def subscribed
@@ -182,7 +182,7 @@ Streams provide the mechanism by which channels route published content
 (broadcasts) to its subscribers.
 
 ```ruby
-# app/channels/application_cable/chat_channel.rb
+# app/channels/chat_channel.rb
 class ChatChannel < ApplicationCable::Channel
   def subscribed
     stream_from "chat_#{params[:room]}"
diff --git a/railties/lib/rails/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake
index 9162ef234a..22785da557 100644
--- a/railties/lib/rails/tasks/tmp.rake
+++ b/railties/lib/rails/tasks/tmp.rake
@@ -5,9 +5,7 @@ namespace :tmp do
   tmp_dirs = [ 'tmp/cache',
                'tmp/sockets',
                'tmp/pids',
-               'tmp/cache/assets/development',
-               'tmp/cache/assets/test',
-               'tmp/cache/assets/production' ]
+               'tmp/cache/assets' ]
 
   tmp_dirs.each { |d| directory d }
 
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 11e19eec80..e32eea42b7 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -344,8 +344,7 @@ module ApplicationTests
 
       clean_assets!
 
-      files = Dir["#{app_path}/public/assets/**/*", "#{app_path}/tmp/cache/assets/development/*",
-                  "#{app_path}/tmp/cache/assets/test/*", "#{app_path}/tmp/cache/assets/production/*"]
+      files = Dir["#{app_path}/public/assets/**/*"]
       assert_equal 0, files.length, "Expected no assets, but found #{files.join(', ')}"
     end