diff options
| author | David Heinemeier Hansson <david@envy8-2.local> | 2008-04-29 16:43:47 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@envy8-2.local> | 2008-04-29 16:43:47 -0500 |
| commit | 5514baf63d6d5e19a84c59a0c2cf74f442daed9c (patch) | |
| tree | ecde263c340d9fdbcf0f3ba9d9276e38f7fbfb96 /railties/lib/initializer.rb | |
| parent | 0780563ae7b2df74613550f1438d13459cb10b1f (diff) | |
| parent | 5be53058775a1482c1e5655dcb0ca4430cf0dbe1 (diff) | |
| download | rails-5514baf63d6d5e19a84c59a0c2cf74f442daed9c.tar.gz rails-5514baf63d6d5e19a84c59a0c2cf74f442daed9c.tar.bz2 rails-5514baf63d6d5e19a84c59a0c2cf74f442daed9c.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib/initializer.rb')
| -rw-r--r-- | railties/lib/initializer.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index e36f917b15..ea61d4e4fe 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -135,12 +135,12 @@ module Rails load_application_initializers - # Prepare dispatcher callbacks and run 'prepare' callbacks - prepare_dispatcher - # the framework is now fully initialized after_initialize + # Prepare dispatcher callbacks and run 'prepare' callbacks + prepare_dispatcher + # Routing must be initialized after plugins to allow the former to extend the routes initialize_routing |