Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Revert "Add config.action_controller.include behavior to plugins." | Jeremy Kemper | 2009-12-30 | 2 | -38/+2 | |
| | | | | | | | | | | | | | | | | This reverts commit 7e8b7f46bfc086a36db996420fbee93348c5268e. Conflicts: railties/lib/rails/plugin.rb | |||||
| * | Remove self-require | Jeremy Kemper | 2009-12-30 | 1 | -2/+1 | |
| | | ||||||
* | | Added .gitkeep to empty directories and --skip-git to skip gitignore/gitkeep ↵ | David Heinemeier Hansson | 2009-12-31 | 1 | -6/+13 | |
| | | | | | | | | files | |||||
* | | Orphan experiment no longer needed | David Heinemeier Hansson | 2009-12-30 | 1 | -69/+0 | |
|/ | ||||||
* | Revert "Add default respond_to formats to ApplicationController." | Jeremy Kemper | 2009-12-29 | 1 | -1/+0 | |
| | | | | | | (Needs consensus that these are appropriate defaults.) This reverts commit 66604b2e0e8d3aba25cab673c7a3d7831a68490c. | |||||
* | Use the correct method for eager loading autoloads | Carl Lerche | 2009-12-29 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' of github.com:rails/rails | Jeremy Kemper | 2009-12-29 | 2 | -12/+15 | |
|\ | ||||||
| * | Make plugins responsible for loading their own rake tasks | Sam Pohlenz | 2009-12-29 | 2 | -7/+5 | |
| | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | |||||
| * | Application object should instantiate non-vendored plugins | Sam Pohlenz | 2009-12-29 | 2 | -5/+10 | |
| | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | |||||
* | | Add rails app --edge and rails app --dev | José Valim | 2009-12-29 | 2 | -8/+25 | |
| | | ||||||
* | | Add default respond_to formats to ApplicationController. | José Valim | 2009-12-29 | 1 | -0/+1 | |
|/ | ||||||
* | Finally remove rails/initializer.rb | Carl Lerche | 2009-12-29 | 1 | -15/+0 | |
| | ||||||
* | 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. | |||||
* | Don't require initializer.rb in core.rb | Carl Lerche | 2009-12-28 | 1 | -1/+0 | |
| | ||||||
* | Move the ActiveRecord related rake tasks into the AR gem. | Carl Lerche | 2009-12-28 | 2 | -470/+0 | |
| | ||||||
* | Add the ability to have plugins load rake tasks. | Carl Lerche | 2009-12-28 | 2 | -0/+15 | |
| | ||||||
* | Added default .gitignore (this is just recognizing Git market share, don't ↵ | David Heinemeier Hansson | 2009-12-27 | 2 | -0/+4 | |
| | | | | throw a hissy if you use another SCM) [DHH] | |||||
* | Fix generators tests. | José Valim | 2009-12-27 | 1 | -2/+3 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-27 | 2 | -1/+37 | |
|\ | ||||||
| * | Merge remote branch 'jose/perf' | Yehuda Katz | 2009-12-27 | 2 | -1/+37 | |
| |\ | ||||||
| | * | Add config.action_controller.include behavior to plugins. | José Valim | 2009-12-27 | 2 | -1/+37 | |
| | | | ||||||
* | | | Fix the i18n dependency problem | David Heinemeier Hansson | 2009-12-27 | 1 | -4/+3 | |
|/ / | ||||||
* / | 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 | 6 | -73/+41 | |
|\ | | | | | | | | | 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 | 6 | -86/+55 | |
| | | | | | | | | 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 | 3 | -73/+26 | |
| | | ||||||
* | | Raise an exception if an initializer is defined without a block | Carlhuda | 2009-12-23 | 1 | -0/+1 | |
| | | ||||||
* | | tests pass with requiring the frameworks in rails.rb | Carlhuda | 2009-12-23 | 2 | -24/+68 | |
|/ | ||||||
* | 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 | 11 | -126/+127 | |
|\ | | | | | | | | | | | 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 | 2 | -31/+33 | |
| | | ||||||
| * | 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 | 7 | -93/+88 | |
| | | | | | | | | more hax required | |||||
* | | Update routes.rb template to use App name | Joshua Peek | 2009-12-21 | 4 | -5/+9 | |
|/ | ||||||
* | Give the builtin controllers their own routes.rb now that the legacy ↵ | David Heinemeier Hansson | 2009-12-21 | 2 | -0/+5 | |
| | | | | catch-all is gone | |||||
* | 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 | 1 | -0/+7 | |
|/ | | | | 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) |