<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,5 +1,7 @@
 *2.3.0 [Edge]*
 
+* Added rake rails:update:application_controller to renamed application.rb to application_controller.rb -- included in rake rails:update so upgrading to 2.3 will automatically trigger it #1439 [kastner]
+
 * Added Rails.backtrace_cleaner as an accessor for the Rails::BacktraceCleaner instance used by the framework to cut down on backtrace noise and config/initializers/backtrace_silencers.rb to add your own (or turn them all off) [DHH]
 
 * Switch from Test::Unit::TestCase to ActiveSupport::TestCase.  [Jeremy Kemper]</diff>
      <filename>railties/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -78,7 +78,7 @@ namespace :rails do
   end
 
   desc &quot;Update both configs, scripts and public/javascripts from Rails&quot;
-  task :update =&gt; [ &quot;update:scripts&quot;, &quot;update:javascripts&quot;, &quot;update:configs&quot; ]
+  task :update =&gt; [ &quot;update:scripts&quot;, &quot;update:javascripts&quot;, &quot;update:configs&quot;, &quot;update:application_controller&quot; ]
 
   namespace :update do
     desc &quot;Add new scripts to the application script/ directory&quot;
@@ -114,5 +114,15 @@ namespace :rails do
       require 'railties_path'  
       FileUtils.cp(RAILTIES_PATH + '/environments/boot.rb', RAILS_ROOT + '/config/boot.rb')
     end
+    
+    desc &quot;Rename application.rb to application_controller.rb&quot;
+    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) &amp;&amp; !File.exists?(new_style)
+        FileUtils.mv(old_style, new_style)
+        puts &quot;#{old_style} has been renamed to #{new_style}, update your SCM as necessary&quot;
+      end
+    end
   end
 end</diff>
      <filename>railties/lib/tasks/framework.rake</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>4d2ccbb364b62275bad142d9a0b66ee7fd0c424a</id>
    </parent>
  </parents>
  <author>
    <name>David Heinemeier Hansson</name>
    <login>dhh</login>
    <email>david@loudthinking.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/9e08a3bb1d47f79b6953056e72eee58e86d83ead</url>
  <id>9e08a3bb1d47f79b6953056e72eee58e86d83ead</id>
  <committed-date>2008-11-23T04:39:30-08:00</committed-date>
  <authored-date>2008-11-23T04:39:30-08:00</authored-date>
  <message>Added rake rails:update:application_controller to renamed application.rb to application_controller.rb -- included in rake rails:update so upgrading to 2.3 will automatically trigger it [#1439 state:committed] (kastner)</message>
  <tree>580239ea9e51653a9305a88a8e395bfed493500f</tree>
  <committer>
    <name>David Heinemeier Hansson</name>
    <login>dhh</login>
    <email>david@loudthinking.com</email>
  </committer>
</commit>
