Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | Merge | David Heinemeier Hansson | 2009-12-22 | 42 | -385/+354 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | All AMo modules are safe to defer | Joshua Peek | 2009-12-22 | 2 | -23/+20 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | All ARes modules are safe to defer | Joshua Peek | 2009-12-22 | 2 | -10/+11 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | All AM modules are safe to defer | Joshua Peek | 2009-12-22 | 4 | -35/+17 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Flip deferrable autoload convention | Joshua Peek | 2009-12-22 | 13 | -261/+290 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | All AD modules are "deferrable" | Joshua Peek | 2009-12-22 | 10 | -23/+35 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Use Rack::Runtime middleware so the reported time includes the entire ↵ | Joshua Peek | 2009-12-22 | 2 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | middleware stack | |||||
| * | | | | | | | | | | | | | | Referer and user agent are in Rack::Request | Joshua Peek | 2009-12-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | AD::StatusCodes support is now part of rack | Joshua Peek | 2009-12-22 | 9 | -46/+12 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Float on rack/master in preparation for rack 1.1 gem release | Joshua Peek | 2009-12-22 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Make ActionMailer::Base inherit from AbstractController::Base | José Valim | 2009-12-22 | 8 | -81/+63 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | |||||
* | | | | | | | | | | | | | | Dont auto require rubygems, move dep on rack-test to Gemfile | David Heinemeier Hansson | 2009-12-22 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Dont encourage __FILE__ bullshit | David Heinemeier Hansson | 2009-12-22 | 1 | -2/+2 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Add test for root | David Heinemeier Hansson | 2009-12-21 | 1 | -0/+9 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'master' of github.com:rails/rails | Joshua Peek | 2009-12-21 | 21 | -248/+249 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | |||||
| * | | | | | | | | | | | | | Fix ActionMailer. The fact that ActionMailer::Base does not inherit from ↵ | Carlhuda | 2009-12-21 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AbstractController::Base is either a bug or we need to re-evaluate the requirements of the mixins. | |||||
| * | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | | | | | | | Dont introspect inline templates for the logger and cleanup a few styling issues | David Heinemeier Hansson | 2009-12-21 | 2 | -18/+13 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | 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 | 5 | -16/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Default route was removed from default route config, patch up failing tests. | Joshua Peek | 2009-12-21 | 1 | -0/+18 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Less annoying RoutingError message | Joshua Peek | 2009-12-21 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | reset_session needs to be a real method so flash can override it | Joshua Peek | 2009-12-21 | 2 | -13/+17 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Update CI bundler | Joshua Peek | 2009-12-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | 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 | 1 | -0/+7 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Missed changelog entry for :inverse_of | Jeremy Kemper | 2009-12-21 | 1 | -0/+7 | |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-21 | 49 | -196/+827 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Its now possible to use match 'stuff' => 'what#stuff' instead of using the ↵ | David Heinemeier Hansson | 2009-12-20 | 2 | -6/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :to for simple routes | |||||
| * | | | | | | | | | | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-20 | 10 | -35/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | We don't need AD parse_config | Joshua Peek | 2009-12-20 | 2 | -21/+0 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | AC::Head now doesn't have an unfulfilled Rendering dependency, and instead ↵ | Yehuda Katz | 2009-12-20 | 8 | -14/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | works just fine standalone (which means that ConditionalGet also doesn't have a Rendering dependency) | |||||
| * | | | | | | | | | | | | | Mark the wild controller route as legacy an comment it out | David Heinemeier Hansson | 2009-12-20 | 1 | -5/+3 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Just a little tidying | David Heinemeier Hansson | 2009-12-20 | 1 | -24/+22 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-20 | 13 | -84/+67 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Rename RackConvenience => RackDelegation | Joshua Peek | 2009-12-20 | 8 | -10/+10 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge Session stuff into RackConvenience | Joshua Peek | 2009-12-20 | 7 | -74/+56 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Missing acts_like dependency | Yehuda Katz | 2009-12-20 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Added ActionDispatch::Request#authorization to access the http ↵ | David Heinemeier Hansson | 2009-12-20 | 2 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authentication header regardless of its proxy hiding [DHH] | |||||
| * | | | | | | | | | | | | | Rename RenderOptions to Renderers | David Heinemeier Hansson | 2009-12-20 | 3 | -6/+5 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Renamed Redirector to Redirecting (its a module, not a class) | David Heinemeier Hansson | 2009-12-20 | 4 | -4/+4 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Rename the RenderingController module to just plain Rendering | David Heinemeier Hansson | 2009-12-20 | 16 | -18/+18 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Remove annoying and useless meta comments | Joshua Peek | 2009-12-20 | 1 | -6/+6 | |
| | | | | | | | | | | | | |