4 files changed, 7 insertions, 23 deletions
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index a2167796eb..d42d001b1a 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -73,15 +73,3 @@ namespace :app do
     end
   end
 end
-
-namespace :rails do
-  %i(update template templates:copy update:configs update:bin).each do |task_name|
-    task "#{task_name}" do
-      ActiveSupport::Deprecation.warn(<<-MSG.squish)
-        Running #{task_name} with the rails: namespace is deprecated in favor of app: namespace.
-        Run bin/rails app:#{task_name} instead.
-      MSG
-      Rake.application.invoke_task("app:#{task_name}")
-    end
-  end
-end
diff --git a/railties/lib/rails/tasks/log.rake b/railties/lib/rails/tasks/log.rake
index c376234fee..ba796845d7 100644
--- a/railties/lib/rails/tasks/log.rake
+++ b/railties/lib/rails/tasks/log.rake
@@ -3,7 +3,7 @@ namespace :log do
   ##
   # Truncates all/specified log files
   # ENV['LOGS']
-  #   - defaults to standard environment log files i.e. 'development,test,production'
+  #   - defaults to all environments log files i.e. 'development,test,production'
   #   - ENV['LOGS']=all truncates all files i.e. log/*.log
   #   - ENV['LOGS']='test,development' truncates only specified files
   desc "Truncates all/specified *.log files in log/ to zero bytes (specify which logs with LOGS=test,development)"
@@ -19,7 +19,7 @@ namespace :log do
     elsif ENV["LOGS"]
       log_files_to_truncate(ENV["LOGS"])
     else
-      log_files_to_truncate("development,test,production")
+      log_files_to_truncate(all_environments.join(","))
     end
   end
 
@@ -33,4 +33,8 @@ namespace :log do
     f = File.open(file, "w")
     f.close
   end
+
+  def all_environments
+    Dir["config/environments/*.rb"].map { |fname| File.basename(fname, ".*") }
+  end
 end
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index f5e5b9ae87..04daaf4a83 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -7,15 +7,8 @@ task routes: :environment do
   all_routes = Rails.application.routes.routes
   require "action_dispatch/routing/inspector"
   inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes)
-  if ARGV.any? { |argv| argv.start_with? "CONTROLLER" }
-    puts <<-eow.strip_heredoc
-      Passing `CONTROLLER` to `bin/rails routes` is deprecated and will be removed in Rails 5.1.
-      Please use `bin/rails routes -c controller_name` instead.
-    eow
-  end
 
   routes_filter = nil
-  routes_filter = { controller: ENV["CONTROLLER"] } if ENV["CONTROLLER"]
 
   OptionParser.new do |opts|
     opts.banner = "Usage: rails routes [options]"
diff --git a/railties/lib/rails/tasks/statistics.rake b/railties/lib/rails/tasks/statistics.rake
index a6cdd1e99c..ba1697186e 100644
--- a/railties/lib/rails/tasks/statistics.rake
+++ b/railties/lib/rails/tasks/statistics.rake
@@ -8,9 +8,8 @@ STATS_DIRECTORIES = [
   %w(Models             app/models),
   %w(Mailers            app/mailers),
   %w(Channels           app/channels),
-  %w(Javascripts        app/assets/javascripts),
+  %w(JavaScripts        app/assets/javascripts),
   %w(Libraries          lib/),
-  %w(Tasks              lib/tasks),
   %w(APIs               app/apis),
   %w(Controller\ tests  test/controllers),
   %w(Helper\ tests      test/helpers),