aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-273-1/+53
|\
| * Merge remote branch 'jose/perf'Yehuda Katz2009-12-273-1/+53
| |\
| | * Add config.action_controller.include behavior to plugins.José Valim2009-12-273-1/+53
| | |
* | | Fix the i18n dependency problemDavid Heinemeier Hansson2009-12-272-5/+4
|/ /
* | Require bundled environment, if present, so Active Support can load i18nJeremy Kemper2009-12-261-0/+5
| |
* | script/server should init Rails by loading config.ruJoshua Peek2009-12-262-18/+8
|/ | | | Fixes "Rails 3.0 doesn't fucking work"
* The new routes shortform now also works for :asDavid Heinemeier Hansson2009-12-241-1/+1
|
* Merge remote branch 'origin/master'Carlhuda2009-12-237-74/+42
|\ | | | | | | | | Conflicts: railties/lib/rails/application.rb
| * Fix reference to Application#configuration to use #configJeremy Kemper2009-12-231-1/+1
| |
| * Isolation tests intentionally avoid loading any state (because they're often ↵Carlhuda2009-12-231-3/+3
| | | | | | | | testing things that have their own load path semantics that should not be polluted), so rack/test is not yet on the load path. Moving require "rack/test" into the setup means and after boot_rails means that it'll be required after the laod path has been altered to add in the Rails vendor/gems
| * Fix Rack::Lock middleware condition: use *unless* we allow concurrencyJeremy Kemper2009-12-231-1/+1
| |
| * Shift more responsibility from application class to its singleton instance. ↵Jeremy Kemper2009-12-236-86/+55
| | | | | | | | Treat instantiation and boot as separate steps. Use app.config rather than app.configuration.
* | Rackup config.ru from the correct directoryCarlhuda2009-12-231-2/+4
| |
* | Require active_support/all unless specifically requested to be left out.Carlhuda2009-12-232-0/+10
| |
* | Finish moving config.frameworks-dependent code to the framework pluginCarlhuda2009-12-232-111/+3
| |
* | Make /rails/info/properties work again. Also, the mocked up tests were ↵Carlhuda2009-12-232-1/+6
| | | | | | | | passing so we added a test that actually tested this functionality.
* | Isolation tests intentionally avoid loading any state (because they're often ↵Carlhuda2009-12-231-3/+3
| | | | | | | | testing things that have their own load path semantics that should not be polluted), so rack/test is not yet on the load path. Moving require "rack/test" into the setup means and after boot_rails means that it'll be required after the laod path has been altered to add in the Rails vendor/gems
* | Moving out some framework specific initializers into the framework libraries.Carlhuda2009-12-235-96/+61
| |
* | Raise an exception if an initializer is defined without a blockCarlhuda2009-12-232-0/+11
| |
* | tests pass with requiring the frameworks in rails.rbCarlhuda2009-12-238-118/+123
|/
* MergeDavid Heinemeier Hansson2009-12-221-0/+1
|\
| * Use Rack::Runtime middleware so the reported time includes the entire ↵Joshua Peek2009-12-221-0/+1
| | | | | | | | middleware stack
* | Dont auto require rubygems, move dep on rack-test to GemfileDavid Heinemeier Hansson2009-12-221-3/+2
|/
* Merge branch 'master' of github.com:rails/railsJoshua Peek2009-12-2118-230/+233
|\ | | | | | | | | | | Conflicts: railties/test/initializer/initialize_i18n_test.rb railties/test/initializer/path_test.rb
| * Blog -> Blog::Application. Leave the toplevel module up for grabs.Jeremy Kemper2009-12-215-35/+37
| |
| * Fix the documentation for root :to. It should use a fully qualified ↵David Heinemeier Hansson2009-12-211-1/+1
| | | | | | | | controller#action syntax (Closes #3606)
| * Dont need to specify password_confirmation, that happens automaticallyDavid Heinemeier Hansson2009-12-211-1/+1
| |
| * Replace reopening the class with App.configure as an alias to class_evalCarlhuda2009-12-214-3/+7
| |
| * test.rb, dev.rb, and production.rb just reopen the Application class; no ↵Carlhuda2009-12-2110-103/+104
| | | | | | | | more hax required
* | Update routes.rb template to use App nameJoshua Peek2009-12-219-14/+29
|/
* Give the builtin controllers their own routes.rb now that the legacy ↵David Heinemeier Hansson2009-12-213-0/+8
| | | | catch-all is gone
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-211-0/+18
|\
| * Default route was removed from default route config, patch up failing tests.Joshua Peek2009-12-211-0/+18
| |
* | Its cookie_verifier_secretDavid Heinemeier Hansson2009-12-211-1/+1
| |
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-212-11/+7
|\|
| * Turn filter_parameter_logging on by default for password and ↵David Heinemeier Hansson2009-12-201-5/+3
| | | | | | | | password_confirmation and remove contentless comments
| * Show the new short-form in an exampleDavid Heinemeier Hansson2009-12-201-1/+1
| |
| * Mark the wild controller route as legacy an comment it outDavid Heinemeier Hansson2009-12-201-5/+3
| |
* | Added cookies.permanent, cookies.signed, and cookies.permanent.signed ↵David Heinemeier Hansson2009-12-202-0/+25
|/ | | | accessor for common cookie actions [DHH]
* Models with no attributes should just have empty hash fixtures [Sam] (Closes ↵David Heinemeier Hansson2009-12-171-5/+9
| | | | #3563)
* Added alert/notice from 2-3-stable and refactored redirect_to into just ↵David Heinemeier Hansson2009-12-172-5/+3
| | | | living in Redirector [DHH]
* Need to lazy realize middleware options so they can be modified inJoshua Peek2009-12-161-3/+3
| | | | the environment
* Fully expand relative rails framework paths and make sure we aren'tJoshua Peek2009-12-162-5/+7
| | | | adding any to the load path more than once.
* Add the ability for plugins to set default configuration settings.Carl Lerche2009-12-157-18/+142
|
* Procs don't call themselvesJoshua Peek2009-12-152-1/+33
| | | | Fixes dev mode reloading [#3574 state:resolved]
* Move route reloading into railtiesJoshua Peek2009-12-143-7/+48
|
* Fix loading plugin and engine route setsJoshua Peek2009-12-141-0/+38
|
* Fix warnings in railties configuration and initializeableJoshua Peek2009-12-142-11/+15
|
* Don't require AD test_caseJoshua Peek2009-12-122-2/+0
|
* Fixed old routing mapper example in generated routes.rbJoshua Peek2009-12-092-2/+2
|