aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add Model.select/group/order/limit/joins/conditions/preload/eager_load class ...Pratik Naik2009-12-264-59/+88
* Merge remote branch 'jose/am'Yehuda Katz2009-12-2524-1422/+113
|\
| * Fix whiny_nil tests, improve error messages and make CI happy.José Valim2009-12-251-6/+7
| * Refactor multiple parts logic and move Utils to PartContainer.José Valim2009-12-254-31/+24
| * adv_attr_accessors in ActionMailer are not sent to the views, use the mailer ...José Valim2009-12-256-42/+79
| * Move i18n to Gemfile.José Valim2009-12-2515-1345/+5
| * Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-2581-915/+960
| |\
| * \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-2235-294/+508
| |\ \
| * \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-21114-857/+1820
| |\ \ \
| * \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-1199-1592/+1833
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-0277-295/+439
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-0117-476/+545
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2520-142/+154
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2414-255/+177
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-232-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2388-1537/+907
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-11216-1447/+1689
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-02447-7603/+6360
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-10-1642-90/+137
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Model.scoped now returns a relation if invoked without any argumentsPratik Naik2009-12-262-11/+25
* | | | | | | | | | | | | | | The controller key shouldnt be part of the mapping if its not usedDavid Heinemeier Hansson2009-12-251-2/+2
* | | | | | | | | | | | | | | Fix testsDavid Heinemeier Hansson2009-12-251-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | This code was needed to work around http://redmine.ruby-lang.org/issues/show/...Yehuda Katz2009-12-241-4/+1
* | | | | | | | | | | | | | Simplify and improve the performance of output_safetyYehuda Katz2009-12-241-22/+6
* | | | | | | | | | | | | | Instead of marking raw text in templates as safe, and then putting them throu...Yehuda Katz2009-12-242-1/+3
* | | | | | | | | | | | | | Dead codeYehuda Katz2009-12-241-15/+0
* | | | | | | | | | | | | | Translated strings in the view are assumed html_safe (Closes #3401)David Heinemeier Hansson2009-12-241-1/+1
* | | | | | | | | | | | | | Stray carrier returnDavid Heinemeier Hansson2009-12-241-1/+0
* | | | | | | | | | | | | | The new routes shortform now also works for :asDavid Heinemeier Hansson2009-12-241-1/+1
* | | | | | | | | | | | | | MergeDavid Heinemeier Hansson2009-12-2433-390/+441
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix new schema test dependency on Hash#to_xmlJeremy Kemper2009-12-231-0/+1
| * | | | | | | | | | | | | | Allow named_routes to be used with root, and with new DSL short-form.Sam Ruby2009-12-232-8/+16
| * | | | | | | | | | | | | | Merge remote branch 'origin/master'Carlhuda2009-12-2310-79/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix reference to Application#configuration to use #configJeremy Kemper2009-12-231-1/+1
| | * | | | | | | | | | | | | | Isolation tests intentionally avoid loading any state (because they're often ...Carlhuda2009-12-231-3/+3
| | * | | | | | | | | | | | | | Routing: fix that route shorthand shouldn't ignore other options. Raise if :a...Jeremy Kemper2009-12-232-4/+8
| | * | | | | | | | | | | | | | Fix Rack::Lock middleware condition: use *unless* we allow concurrencyJeremy Kemper2009-12-231-1/+1
| | * | | | | | | | | | | | | | Shift more responsibility from application class to its singleton instance. T...Jeremy Kemper2009-12-237-87/+56
| * | | | | | | | | | | | | | | Rackup config.ru from the correct directoryCarlhuda2009-12-231-2/+4
| * | | | | | | | | | | | | | | Require active_support/all unless specifically requested to be left out.Carlhuda2009-12-232-0/+10
| * | | | | | | | | | | | | | | Remove the ActionView::Base autoload because it creates crazy circular autolo...Carlhuda2009-12-231-1/+1
| * | | | | | | | | | | | | | | Finish moving config.frameworks-dependent code to the framework pluginCarlhuda2009-12-237-126/+110
| * | | | | | | | | | | | | | | Make /rails/info/properties work again. Also, the mocked up tests were passin...Carlhuda2009-12-232-1/+6
| * | | | | | | | | | | | | | | Isolation tests intentionally avoid loading any state (because they're often ...Carlhuda2009-12-231-3/+3
| * | | | | | | | | | | | | | | Moving out some framework specific initializers into the framework libraries.Carlhuda2009-12-238-96/+141
| * | | | | | | | | | | | | | | Raise an exception if an initializer is defined without a blockCarlhuda2009-12-232-0/+11
| * | | | | | | | | | | | | | | tests pass with requiring the frameworks in rails.rbCarlhuda2009-12-238-118/+123
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Fix bare string Rack response bodiesJeremy Kemper2009-12-231-2/+2
| * | | | | | | | | | | | | | Fix ActiveSupport::JSON encoding of control characters [\x00-\x1f]Dwayne Litzenberger2009-12-232-3/+14
* | | | | | | | | | | | | | | Extract Mapping class from monster match methodDavid Heinemeier Hansson2009-12-242-91/+149
|/ / / / / / / / / / / / / /