Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge | David Heinemeier Hansson | 2010-01-03 | 1 | -14/+1 |
|\ | |||||
| * | AppName::Application.root should work | Yehuda Katz | 2010-01-02 | 1 | -1/+1 |
| | | |||||
| * | Rails notifications are set through Railtie in each framework. | José Valim | 2010-01-02 | 1 | -13/+0 |
| | | |||||
* | | Time zoning should be turned on by default with UTC | David Heinemeier Hansson | 2010-01-03 | 1 | -10/+8 |
|/ | |||||
* | Some railties cleanup: | Carl Lerche | 2009-12-31 | 1 | -2/+2 |
| | | | | | | * Rename <framework>/rails.rb -> <framework>/railtie.rb * Rails::Plugin -> Rails::Railtie * Rails::Plugin::Vendored -> Rails::Plugin | ||||
* | Fully remove config.frameworks in favor of requires in boot.rb | Carl Lerche | 2009-12-31 | 1 | -1/+3 |
| | |||||
* | Use the correct method for eager loading autoloads | Carl Lerche | 2009-12-29 | 1 | -1/+1 |
| | |||||
* | Make plugins responsible for loading their own rake tasks | Sam Pohlenz | 2009-12-29 | 1 | -7/+1 |
| | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
* | Application object should instantiate non-vendored plugins | Sam Pohlenz | 2009-12-29 | 1 | -1/+1 |
| | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
* | Check to see if the plugin object responds to load_tasks (vendor/plugin/* ↵ | Carl Lerche | 2009-12-29 | 1 | -1/+4 |
| | | | | does not yet) Fixes Sam Ruby's tests. | ||||
* | Add the ability to have plugins load rake tasks. | Carl Lerche | 2009-12-28 | 1 | -0/+5 |
| | |||||
* | Merge remote branch 'origin/master' | Carlhuda | 2009-12-23 | 1 | -64/+32 |
|\ | | | | | | | | | Conflicts: railties/lib/rails/application.rb | ||||
| * | 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 | 1 | -77/+46 |
| | | | | | | | | Treat instantiation and boot as separate steps. Use app.config rather than app.configuration. | ||||
* | | Require active_support/all unless specifically requested to be left out. | Carlhuda | 2009-12-23 | 1 | -0/+4 |
| | | |||||
* | | Finish moving config.frameworks-dependent code to the framework plugin | Carlhuda | 2009-12-23 | 1 | -111/+1 |
| | | |||||
* | | Moving out some framework specific initializers into the framework libraries. | Carlhuda | 2009-12-23 | 1 | -59/+7 |
| | | |||||
* | | tests pass with requiring the frameworks in rails.rb | Carlhuda | 2009-12-23 | 1 | -24/+34 |
|/ | |||||
* | Use Rack::Runtime middleware so the reported time includes the entire ↵ | Joshua Peek | 2009-12-22 | 1 | -0/+1 |
| | | | | middleware stack | ||||
* | Merge branch 'master' of github.com:rails/rails | Joshua Peek | 2009-12-21 | 1 | -18/+11 |
|\ | | | | | | | | | | | Conflicts: railties/test/initializer/initialize_i18n_test.rb railties/test/initializer/path_test.rb | ||||
| * | Replace reopening the class with App.configure as an alias to class_eval | Carlhuda | 2009-12-21 | 1 | -0/+4 |
| | | |||||
| * | test.rb, dev.rb, and production.rb just reopen the Application class; no ↵ | Carlhuda | 2009-12-21 | 1 | -18/+7 |
| | | | | | | | | more hax required | ||||
* | | Update routes.rb template to use App name | Joshua Peek | 2009-12-21 | 1 | -0/+4 |
|/ | |||||
* | Give the builtin controllers their own routes.rb now that the legacy ↵ | David Heinemeier Hansson | 2009-12-21 | 1 | -0/+1 |
| | | | | catch-all is gone | ||||
* | Need to lazy realize middleware options so they can be modified in | Joshua Peek | 2009-12-16 | 1 | -3/+3 |
| | | | | the environment | ||||
* | Add the ability for plugins to set default configuration settings. | Carl Lerche | 2009-12-15 | 1 | -1/+7 |
| | |||||
* | Procs don't call themselves | Joshua Peek | 2009-12-15 | 1 | -1/+1 |
| | | | | Fixes dev mode reloading [#3574 state:resolved] | ||||
* | Move route reloading into railties | Joshua Peek | 2009-12-14 | 1 | -4/+45 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | Joshua Peek | 2009-12-02 | 1 | -35/+17 |
|\ | |||||
| * | Stop evalling the environment file in favor of require + setting a ↵ | Carlhuda | 2009-12-02 | 1 | -18/+17 |
| | | | | | | | | Kernel#config. This will fix the bug where reopening classes caused them to be overwritten. | ||||
| * | Add support for bare ActiveSupport via config.active_support.bare | Carlhuda | 2009-12-02 | 1 | -15/+2 |
| | | |||||
| * | Remove global Rails initializers | Carlhuda | 2009-12-02 | 1 | -4/+0 |
| | | |||||
* | | Move controller namespace tracking into route set so it gets | Joshua Peek | 2009-12-02 | 1 | -1/+1 |
|/ | | | | reloaded in dev mode | ||||
* | Load application specific rake tasks in the application object | Carl Lerche | 2009-11-25 | 1 | -0/+2 |
| | |||||
* | Have script/* and Rakefile use the application object | Carlhuda | 2009-11-24 | 1 | -5/+13 |
| | |||||
* | Revert "Final steps toward clean rails "foo"; cd foo; gem bundle; ↵ | Jeremy Kemper | 2009-11-19 | 1 | -1/+5 |
| | | | | | | | | script/server working" Broke stuff. This reverts commit 520b8b59110dd130c89b317b6bd65d8644c7836f. | ||||
* | Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working | Yehuda Katz + Carl Lerche | 2009-11-18 | 1 | -5/+1 |
| | |||||
* | Make script/server work with correct application.rb | Yehuda Katz | 2009-11-16 | 1 | -0/+5 |
| | |||||
* | Refactor plugins | Yehuda Katz + Carl Lerche | 2009-11-11 | 1 | -37/+13 |
| | |||||
* | Conceptually unify instance & global initializers | Yehuda Katz + Carl Lerche | 2009-11-05 | 1 | -14/+31 |
| | |||||
* | Configure generator when needed rather than during initialization | Jeremy Kemper | 2009-11-03 | 1 | -12/+0 |
| | |||||
* | Pass config.generators options along when RAILS_GENERATORS is set and show ↵ | José Valim | 2009-11-03 | 1 | -1/+2 |
| | | | | | | --force-plural message just once. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Clarify date/time dependencies | Jeremy Kemper | 2009-11-02 | 1 | -0/+1 |
| | |||||
* | Tests pass again | Yehuda Katz | 2009-10-27 | 1 | -2/+2 |
| | |||||
* | Remove some remnants of config.gem | Carl Lerche | 2009-10-17 | 1 | -60/+5 |
| | |||||
* | Remove config.gem in favor of using the bundler. This makes config/boot.rb ↵ | Carl Lerche | 2009-10-16 | 1 | -16/+0 |
| | | | | | | obsolete. The bundler library is at: http://github.com/wycats/bundler/ and is a rubygem. | ||||
* | Use Rails.initialize! where we just want to run the initializers and aren't ↵ | Joshua Peek | 2009-10-16 | 1 | -0/+5 |
| | | | | concerned about the config | ||||
* | Renamed Orchestra to Notifications once again [#3321 state:resolved] | José Valim | 2009-10-15 | 1 | -3/+3 |
| | |||||
* | Configure Orchestra on initialization. | José Valim | 2009-10-15 | 1 | -0/+11 |
| | |||||
* | Have Rails.root be based off of config.ru | Carl Lerche | 2009-10-14 | 1 | -3/+7 |
| |