Merge pull request #11420 from simi/remove_update_application_controller_task

Remove update:application_controller rake task.

2 files changed, 6 insertions, 12 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 13a3301fbd..e4ed59e58c 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Removed `update:application_controller` rake task.
+
+    *Josef Šimánek*
+
 *   Fix `rake environment` to do not eager load modules
 
     *Paul Nikitochkin*
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 76a95304c3..bd4e7c33e0 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -1,6 +1,6 @@
 namespace :rails do
-  desc "Update configs and some other initially generated files (or use just update:configs, update:bin, or update:application_controller)"
-  task update: [ "update:configs", "update:bin", "update:application_controller" ]
+  desc "Update configs and some other initially generated files (or use just update:configs or update:bin)"
+  task update: [ "update:configs", "update:bin" ]
 
   desc "Applies the template supplied by LOCATION=(/path/to/template) or URL"
   task :template do
@@ -62,15 +62,5 @@ namespace :rails do
     task :bin do
       invoke_from_app_generator :create_bin_files
     end
-
-    # desc "Rename application.rb to application_controller.rb"
-    task :application_controller do
-      old_style = Rails.root + '/app/controllers/application.rb'
-      new_style = Rails.root + '/app/controllers/application_controller.rb'
-      if File.exists?(old_style) && !File.exists?(new_style)
-        FileUtils.mv(old_style, new_style)
-        puts "#{old_style} has been renamed to #{new_style}, update your SCM as necessary"
-      end
-    end
   end
 end