diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-15 11:30:09 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-15 11:30:09 +0000 |
| commit | 4d9cda5732538e9cdb325b2ffa7f9e97f8ac2ec0 (patch) | |
| tree | b00a149a047e97b978be9bcbcfe5b9e4b02ec0d5 /railties/helpers | |
| parent | a02a96226e08557ba6abf70fa80168fe512b8f93 (diff) | |
| download | rails-4d9cda5732538e9cdb325b2ffa7f9e97f8ac2ec0.tar.gz rails-4d9cda5732538e9cdb325b2ffa7f9e97f8ac2ec0.tar.bz2 rails-4d9cda5732538e9cdb325b2ffa7f9e97f8ac2ec0.zip | |
Renamed AbstractApplicationController and abstract_application.rb to ApplicationController and application.rb, so that it will be possible for the framework to automatically pick up on app/views/layouts/application.rhtml and app/helpers/application.rb
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@159 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/helpers')
| -rw-r--r-- | railties/helpers/application.rb (renamed from railties/helpers/abstract_application.rb) | 3 | ||||
| -rw-r--r-- | railties/helpers/test_helper.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/railties/helpers/abstract_application.rb b/railties/helpers/application.rb index fa26cd0399..87ca44126d 100644 --- a/railties/helpers/abstract_application.rb +++ b/railties/helpers/application.rb @@ -1,5 +1,4 @@ # The filters added to this controller will be run for all controllers in the application. # Likewise will all the methods added be available for all controllers. -class AbstractApplicationController < ActionController::Base - helper :application +class ApplicationController < ActionController::Base end
\ No newline at end of file diff --git a/railties/helpers/test_helper.rb b/railties/helpers/test_helper.rb index ce1150c606..83f4069ffd 100644 --- a/railties/helpers/test_helper.rb +++ b/railties/helpers/test_helper.rb @@ -1,6 +1,6 @@ ENV["RAILS_ENV"] ||= "test" require File.dirname(__FILE__) + "/../config/environment" -require 'abstract_application' +require 'application' require 'test/unit' require 'active_record/fixtures' |