4 files changed, 30 insertions, 6 deletions
diff --git a/railties/lib/rails/tasks/dev.rake b/railties/lib/rails/tasks/dev.rake
new file mode 100644
index 0000000000..d2ceaacc0c
--- /dev/null
+++ b/railties/lib/rails/tasks/dev.rake
@@ -0,0 +1,8 @@
+require 'rails/dev_caching'
+
+namespace :dev do
+  desc 'Toggle development mode caching on/off'
+  task :cache do
+    Rails::DevCaching.enable_by_file
+  end
+end
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 904b9d9ad6..61fb8311a5 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -1,4 +1,6 @@
-namespace :rails do
+require 'active_support/deprecation'
+
+namespace :app do
   desc "Update configs and some other initially generated files (or use just update:configs or update:bin)"
   task update: [ "update:configs", "update:bin" ]
 
@@ -45,8 +47,9 @@ namespace :rails do
         @app_generator ||= begin
           require 'rails/generators'
           require 'rails/generators/rails/app/app_generator'
-          gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
-            destination_root: Rails.root
+          gen = Rails::Generators::AppGenerator.new ["rails"],
+                                                    { api: !!Rails.application.config.api_only },
+                                                    destination_root: Rails.root
           File.exist?(Rails.root.join("config", "application.rb")) ?
             gen.send(:app_const) : gen.send(:valid_const?)
           gen
@@ -66,3 +69,15 @@ namespace :rails 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/restart.rake b/railties/lib/rails/tasks/restart.rake
index f36c86d81b..7e15bb55a1 100644
--- a/railties/lib/rails/tasks/restart.rake
+++ b/railties/lib/rails/tasks/restart.rake
@@ -2,4 +2,5 @@ desc "Restart app by touching tmp/restart.txt"
 task :restart do
   FileUtils.mkdir_p('tmp')
   FileUtils.touch('tmp/restart.txt')
+  FileUtils.rm_f('tmp/pids/server.pid')
 end
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 939fa59c75..69103aa5d9 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -2,7 +2,7 @@ require 'active_support/deprecation'
 require 'active_support/core_ext/string/strip' # for strip_heredoc
 require 'optparse'
 
-desc 'Print out all defined routes in match order, with names. Target specific controller with --controller option - or its -c shorthand.'
+desc 'Print out all defined routes in match order, with names. Target specific controller with -c option, or grep routes using -g option'
 task routes: :environment do
   all_routes = Rails.application.routes.routes
   require 'action_dispatch/routing/inspector'
@@ -19,11 +19,11 @@ task routes: :environment do
 
   OptionParser.new do |opts|
     opts.banner = "Usage: rails routes [options]"
-    opts.on("-c", "--controller [CONTROLLER]") do |controller|
+    opts.on("-c CONTROLLER") do |controller|
       routes_filter = { controller: controller }
     end
 
-    opts.on("-g", "--grep [PATTERN]") do |pattern|
+    opts.on("-g PATTERN") do |pattern|
       routes_filter = pattern
     end