Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-27 | 3 | -1/+53 |
|\ | |||||
| * | Merge remote branch 'jose/perf' | Yehuda Katz | 2009-12-27 | 3 | -1/+53 |
| |\ | |||||
| | * | Add config.action_controller.include behavior to plugins. | José Valim | 2009-12-27 | 3 | -1/+53 |
| | | | |||||
* | | | Fix the i18n dependency problem | David Heinemeier Hansson | 2009-12-27 | 2 | -5/+4 |
|/ / | |||||
* | | Require bundled environment, if present, so Active Support can load i18n | Jeremy Kemper | 2009-12-26 | 1 | -0/+5 |
| | | |||||
* | | script/server should init Rails by loading config.ru | Joshua Peek | 2009-12-26 | 2 | -18/+8 |
|/ | | | | Fixes "Rails 3.0 doesn't fucking work" | ||||
* | The new routes shortform now also works for :as | David Heinemeier Hansson | 2009-12-24 | 1 | -1/+1 |
| | |||||
* | Merge remote branch 'origin/master' | Carlhuda | 2009-12-23 | 7 | -74/+42 |
|\ | | | | | | | | | Conflicts: railties/lib/rails/application.rb | ||||
| * | Fix reference to Application#configuration to use #config | Jeremy Kemper | 2009-12-23 | 1 | -1/+1 |
| | | |||||
| * | Isolation tests intentionally avoid loading any state (because they're often ↵ | Carlhuda | 2009-12-23 | 1 | -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 concurrency | Jeremy Kemper | 2009-12-23 | 1 | -1/+1 |
| | | |||||
| * | Shift more responsibility from application class to its singleton instance. ↵ | Jeremy Kemper | 2009-12-23 | 6 | -86/+55 |
| | | | | | | | | Treat instantiation and boot as separate steps. Use app.config rather than app.configuration. | ||||
* | | Rackup config.ru from the correct directory | Carlhuda | 2009-12-23 | 1 | -2/+4 |
| | | |||||
* | | Require active_support/all unless specifically requested to be left out. | Carlhuda | 2009-12-23 | 2 | -0/+10 |
| | | |||||
* | | Finish moving config.frameworks-dependent code to the framework plugin | Carlhuda | 2009-12-23 | 2 | -111/+3 |
| | | |||||
* | | Make /rails/info/properties work again. Also, the mocked up tests were ↵ | Carlhuda | 2009-12-23 | 2 | -1/+6 |
| | | | | | | | | passing so we added a test that actually tested this functionality. | ||||
* | | Isolation tests intentionally avoid loading any state (because they're often ↵ | Carlhuda | 2009-12-23 | 1 | -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. | Carlhuda | 2009-12-23 | 5 | -96/+61 |
| | | |||||
* | | Raise an exception if an initializer is defined without a block | Carlhuda | 2009-12-23 | 2 | -0/+11 |
| | | |||||
* | | tests pass with requiring the frameworks in rails.rb | Carlhuda | 2009-12-23 | 8 | -118/+123 |
|/ | |||||
* | Merge | David Heinemeier Hansson | 2009-12-22 | 1 | -0/+1 |
|\ | |||||
| * | Use Rack::Runtime middleware so the reported time includes the entire ↵ | Joshua Peek | 2009-12-22 | 1 | -0/+1 |
| | | | | | | | | middleware stack | ||||
* | | Dont auto require rubygems, move dep on rack-test to Gemfile | David Heinemeier Hansson | 2009-12-22 | 1 | -3/+2 |
|/ | |||||
* | Merge branch 'master' of github.com:rails/rails | Joshua Peek | 2009-12-21 | 18 | -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 Kemper | 2009-12-21 | 5 | -35/+37 |
| | | |||||
| * | Fix the documentation for root :to. It should use a fully qualified ↵ | David Heinemeier Hansson | 2009-12-21 | 1 | -1/+1 |
| | | | | | | | | controller#action syntax (Closes #3606) | ||||
| * | Dont need to specify password_confirmation, that happens automatically | David Heinemeier Hansson | 2009-12-21 | 1 | -1/+1 |
| | | |||||
| * | Replace reopening the class with App.configure as an alias to class_eval | Carlhuda | 2009-12-21 | 4 | -3/+7 |
| | | |||||
| * | test.rb, dev.rb, and production.rb just reopen the Application class; no ↵ | Carlhuda | 2009-12-21 | 10 | -103/+104 |
| | | | | | | | | more hax required | ||||
* | | Update routes.rb template to use App name | Joshua Peek | 2009-12-21 | 9 | -14/+29 |
|/ | |||||
* | Give the builtin controllers their own routes.rb now that the legacy ↵ | David Heinemeier Hansson | 2009-12-21 | 3 | -0/+8 |
| | | | | catch-all is gone | ||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-21 | 1 | -0/+18 |
|\ | |||||
| * | Default route was removed from default route config, patch up failing tests. | Joshua Peek | 2009-12-21 | 1 | -0/+18 |
| | | |||||
* | | Its cookie_verifier_secret | David Heinemeier Hansson | 2009-12-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-21 | 2 | -11/+7 |
|\| | |||||
| * | Turn filter_parameter_logging on by default for password and ↵ | David Heinemeier Hansson | 2009-12-20 | 1 | -5/+3 |
| | | | | | | | | password_confirmation and remove contentless comments | ||||
| * | Show the new short-form in an example | David Heinemeier Hansson | 2009-12-20 | 1 | -1/+1 |
| | | |||||
| * | Mark the wild controller route as legacy an comment it out | David Heinemeier Hansson | 2009-12-20 | 1 | -5/+3 |
| | | |||||
* | | Added cookies.permanent, cookies.signed, and cookies.permanent.signed ↵ | David Heinemeier Hansson | 2009-12-20 | 2 | -0/+25 |
|/ | | | | accessor for common cookie actions [DHH] | ||||
* | Models with no attributes should just have empty hash fixtures [Sam] (Closes ↵ | David Heinemeier Hansson | 2009-12-17 | 1 | -5/+9 |
| | | | | #3563) | ||||
* | Added alert/notice from 2-3-stable and refactored redirect_to into just ↵ | David Heinemeier Hansson | 2009-12-17 | 2 | -5/+3 |
| | | | | living in Redirector [DHH] | ||||
* | Need to lazy realize middleware options so they can be modified in | Joshua Peek | 2009-12-16 | 1 | -3/+3 |
| | | | | the environment | ||||
* | Fully expand relative rails framework paths and make sure we aren't | Joshua Peek | 2009-12-16 | 2 | -5/+7 |
| | | | | adding any to the load path more than once. | ||||
* | Add the ability for plugins to set default configuration settings. | Carl Lerche | 2009-12-15 | 7 | -18/+142 |
| | |||||
* | Procs don't call themselves | Joshua Peek | 2009-12-15 | 2 | -1/+33 |
| | | | | Fixes dev mode reloading [#3574 state:resolved] | ||||
* | Move route reloading into railties | Joshua Peek | 2009-12-14 | 3 | -7/+48 |
| | |||||
* | Fix loading plugin and engine route sets | Joshua Peek | 2009-12-14 | 1 | -0/+38 |
| | |||||
* | Fix warnings in railties configuration and initializeable | Joshua Peek | 2009-12-14 | 2 | -11/+15 |
| | |||||
* | Don't require AD test_case | Joshua Peek | 2009-12-12 | 2 | -2/+0 |
| | |||||
* | Fixed old routing mapper example in generated routes.rb | Joshua Peek | 2009-12-09 | 2 | -2/+2 |
| |