Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add tests for assert_template :template | Mike Breen | 2009-05-17 | 1 | -0/+23 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Merge Failsafe middleware into ShowExceptions | Joshua Peek | 2009-05-17 | 9 | -106/+65 |
| | |||||
* | Rescue hack was supposed to be removed. Some how it crept back in. | Joshua Peek | 2009-05-17 | 4 | -10/+2 |
| | |||||
* | Ensure number_to_human_size does not strip zeros from the end [#1763 ↵ | Travis Briggs | 2009-05-17 | 2 | -1/+10 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Simplify filter_chain method implementation [#2327 state:resolved] | Thomas E. Glasgow | 2009-05-17 | 1 | -6/+1 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Implement #many? for NamedScope and AssociationCollection using #size [#1500 ↵ | Chris Kampmeier | 2009-05-17 | 5 | -1/+94 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure auto_link does not ignore multiple trailing punctuations [#2504 ↵ | Lance Ivy | 2009-05-17 | 2 | -6/+14 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Add support for parsing XML and JSON from an IO as well as a string [#2659 ↵ | Brian Lopez | 2009-05-17 | 9 | -30/+77 |
| | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Remove obsolete wiki reference [#2291 state:resolved] | Mike Gunderloy | 2009-05-17 | 1 | -1/+1 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix typo in the generated routes.rb [#2433 state:resolved] | Paulo Schneider | 2009-05-17 | 1 | -1/+1 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Supply valid ruby-prof parameters [#1804 state:resolved] | Jacob Kjeldahl | 2009-05-17 | 1 | -1/+1 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | has_one :through should not create a new association when assigned nil [#698 ↵ | Daniel Guettler | 2009-05-17 | 2 | -9/+16 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure rake test does not run new base tests as that requires rack/test | Pratik Naik | 2009-05-17 | 1 | -1/+1 |
| | |||||
* | Ensure WhiteListSanitizer allows dl tag [#2393 state:resolved] | Jeffrey Chupp | 2009-05-17 | 1 | -1/+1 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Get Railties passing again | Yehuda Katz | 2009-05-16 | 8 | -17/+23 |
| | |||||
* | Fix ActionMailer Symbol#to_proc instance | Yehuda Katz | 2009-05-16 | 1 | -1/+1 |
| | |||||
* | Get AR CI passing again by requiring the entire core_ext | Yehuda Katz | 2009-05-16 | 1 | -0/+3 |
| | | | | | Note that this includes Time and Date; we should really figure out what parts of core_ext are really required for AR and require just those. | ||||
* | Changelog | Bryan Helmkamp | 2009-05-16 | 1 | -0/+2 |
| | |||||
* | Instead of checking Rails.env.test? in Failsafe middleware, check ↵ | Bryan Helmkamp | 2009-05-16 | 3 | -8/+9 |
| | | | | env["rails.raise_exceptions"] | ||||
* | Include guides directory in the rails gem | Pratik Naik | 2009-05-16 | 1 | -3/+4 |
| | |||||
* | Ported Rescuable to new base | Yehuda Katz + Carl Lerche | 2009-05-15 | 9 | -27/+111 |
| | |||||
* | Refactored AbstractController to provide better hook points for overriding ↵ | Yehuda Katz + Carl Lerche | 2009-05-15 | 5 | -33/+39 |
| | | | | aspects of action dispatching | ||||
* | Allow strings to be sent as collection to select. | José Valim | 2009-05-15 | 2 | -0/+24 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Merge commit 'origin/master' | Yehuda Katz + Carl Lerche | 2009-05-14 | 11 | -16/+65 |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb | ||||
| * | Minimal base/new_base comparison | Jeremy Kemper | 2009-05-14 | 6 | -21/+50 |
| | | |||||
| * | Cherry-picking Active Support extensions | Jeremy Kemper | 2009-05-14 | 2 | -2/+5 |
| | | |||||
| * | Simple example for require profiling | Jeremy Kemper | 2009-05-14 | 1 | -0/+17 |
| | | |||||
| * | Changed ActiveRecord::Base#exists? to invoke find_initial so that it is ↵ | Peter Marklund | 2009-05-14 | 2 | -8/+9 |
| | | | | | | | | | | | | | | compatible with, and doesn't lose, :include scopes (references to eager loaded tables) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2543 state:committed] | ||||
* | | Got new base to pass controller/base_test.rb, implemented method_missing ↵ | Yehuda Katz + Carl Lerche | 2009-05-14 | 8 | -11/+61 |
| | | | | | | | | action semantics in compatibility mode, and fixed a few action_missing bugs. | ||||
* | | Cleaning up more render tests | Yehuda Katz + Carl Lerche | 2009-05-14 | 11 | -33/+122 |
|/ | |||||
* | Ported over render :file tests. | Yehuda Katz + Carl Lerche | 2009-05-13 | 8 | -321/+585 |
| | |||||
* | Simple examples for require profiling | Jeremy Kemper | 2009-05-13 | 3 | -2/+32 |
| | |||||
* | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 71 | -83/+168 |
| | |||||
* | isolated_test task | Jeremy Kemper | 2009-05-13 | 2 | -6/+20 |
| | |||||
* | Remove support for deprecated validation message interpolation format | Jeremy Kemper | 2009-05-13 | 3 | -53/+8 |
| | |||||
* | Preserve ordering | Jeremy Kemper | 2009-05-13 | 1 | -2/+8 |
| | |||||
* | Defer rake/contrib requires so we can use the stdlib rake instead of the ↵ | Jeremy Kemper | 2009-05-13 | 2 | -2/+4 |
| | | | | full gem | ||||
* | Implemented redirects and partial rendering in new base. | Yehuda Katz + Carl Lerche | 2009-05-12 | 20 | -102/+251 |
| | |||||
* | Fixed new callbacks to not call the action when a callback sets the response ↵ | Yehuda Katz + Carl Lerche | 2009-05-12 | 2 | -1/+20 |
| | | | | body | ||||
* | Defer rake/contrib/sshpublisher require so we can use the stdlib rake ↵ | Jeremy Kemper | 2009-05-11 | 1 | -1/+2 |
| | | | | instead of the full gem | ||||
* | Use DependencyModule for included hooks in ActiveRecord | Bryan Helmkamp | 2009-05-11 | 21 | -125/+111 |
| | |||||
* | Merge branch 'master' into wip_abstract_controller | Yehuda Katz + Carl Lerche | 2009-05-11 | 125 | -930/+1539 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb | ||||
| * | Revert "Whitespace!" | Yehuda Katz + Carl Lerche | 2009-05-11 | 14 | -84/+95 |
| | | | | | | | | This reverts commit a747ab5b20b9d543e9d311070e3b720c761ae716. | ||||
| * | Revert "Fixed bug with polymorphic has_one :as pointing to an STI record" | Jeremy Kemper | 2009-05-11 | 6 | -21/+5 |
| | | | | | | | | | | | | [#2594 state:open] This reverts commit 99c103be1165da9c8299bc0977188ecf167e06a5. | ||||
| * | ActiveSupport::OrderedHash[1,2,3,4] creates an OrderedHash instead of a Hash. | Douglas F Shearer | 2009-05-11 | 2 | -0/+16 |
| | | | | | | | | | | | | [#2615 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-11 | 17 | -13/+173 |
| |\ | |||||
| | * | Added db/seeds.rb as a default file for storing seed data for the database. ↵ | David Heinemeier Hansson | 2009-05-11 | 5 | -2/+31 |
| | | | | | | | | | | | | Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the "Stop Putting Gawd Damn Seed Data In Your Migrations" feature) [DHH] | ||||
| | * | Change spelling of Kyev timezone to Kyiv [#2613 state:resolved] | Alexander Dymo | 2009-05-10 | 2 | -2/+4 |
| | | | |||||
| | * | Allow you to pass :all_blank to :reject_if option to automatically create a ↵ | Mike Breen | 2009-05-10 | 4 | -2/+30 |
| | | | | | | | | | | | | Proc that will reject any record with blank attributes. | ||||
| | * | Fixed eager load error on find with include => [:table_name] and hash ↵ | Anthony Crumley | 2009-05-10 | 2 | -4/+28 |
| | | | | | | | | | | | | | | | | | | conditions like {:table_name => {:column => 'value'}} Signed-off-by: Michael Koziarski <michael@koziarski.com> |