Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update vendored Thor. | José Valim | 2010-01-02 | 33 | -260/+263 |
| | |||||
* | Some railties cleanup: | Carl Lerche | 2009-12-31 | 13 | -105/+112 |
| | | | | | | * Rename <framework>/rails.rb -> <framework>/railtie.rb * Rails::Plugin -> Rails::Railtie * Rails::Plugin::Vendored -> Rails::Plugin | ||||
* | Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rb | Carl Lerche | 2009-12-31 | 11 | -132/+131 |
| | |||||
* | Raise a helpful error if config.frameworks is used | Carl Lerche | 2009-12-31 | 2 | -0/+23 |
| | |||||
* | Add a /rails.rb for each framework for consistency | Carl Lerche | 2009-12-31 | 2 | -4/+12 |
| | |||||
* | Fully remove config.frameworks in favor of requires in boot.rb | Carl Lerche | 2009-12-31 | 8 | -38/+24 |
| | |||||
* | Dont gitkeep things that are gitignored | David Heinemeier Hansson | 2009-12-31 | 1 | -1/+1 |
| | |||||
* | Clarify assertion | Jeremy Kemper | 2009-12-30 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-31 | 4 | -56/+3 |
|\ | |||||
| * | Revert "Add config.action_controller.include behavior to plugins." | Jeremy Kemper | 2009-12-30 | 3 | -54/+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 | 2 | -1/+17 |
| | |||||
* | 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> | ||||
* | | Clean up railties Rakefile from old responsibilities which are now part of ↵ | José Valim | 2009-12-29 | 1 | -67/+2 |
| | | | | | | | | main Rakefile | ||||
* | | Add rails app --edge and rails app --dev | José Valim | 2009-12-29 | 3 | -8/+38 |
| | | |||||
* | | 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 | 2 | -16/+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 | 4 | -12/+26 |
| | |||||
* | 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 | 3 | -0/+42 |
| | |||||
* | Fix copy/pasted test class name | Jeremy Kemper | 2009-12-28 | 1 | -97/+99 |
| | |||||
* | Fix ruby version test | Jeremy Kemper | 2009-12-28 | 1 | -40/+9 |
| | |||||
* | Added default .gitignore (this is just recognizing Git market share, don't ↵ | David Heinemeier Hansson | 2009-12-27 | 3 | -0/+6 |
| | | | | 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 | 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 |
|/ |