Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 1 | -2/+2 | |
| |\ | ||||||
| | * | Remove unnecessary condition and local variable [#2602 state:resolved] | Emilio Tagua | 2009-05-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | Include acts_as_string? | Jeremy Kemper | 2009-05-18 | 1 | -0/+1 | |
| | | | ||||||
| * | | Add ability to get multiple memcached keys at the same time (via ↵ | Joe Van Dyk | 2009-05-18 | 3 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | MemCacheStore#read_multi). Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 7 | -4/+45 | |
| |\| | ||||||
| | * | Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵ | Luca Guidi | 2009-05-18 | 2 | -2/+15 | |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| | * | Make sure default_scope#create checks for options[:conditions] [#2181 ↵ | Pratik Naik | 2009-05-18 | 3 | -1/+21 | |
| | | | | | | | | | | | | state:resolved] [James Le Cuirot] | |||||
| | * | Truncate helper accepts a :separator for a more legible result [#1807 ↵ | Andy Stewart | 2009-05-18 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | Reimplement Fixtures.identify so that it consistently generates identities ↵ | Ken Collins | 2009-05-18 | 2 | -4/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | across ruby versions. [#2633 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | Missing 1.8.7 backport extensions | Jeremy Kemper | 2009-05-18 | 2 | -0/+3 | |
| | | | ||||||
| * | | Revert "Get AR CI passing again by requiring the entire core_ext" | Jeremy Kemper | 2009-05-18 | 1 | -3/+0 | |
| | | | | | | | | | | | | This reverts commit 8e6a18d8672f7efe6ef79b49185e4a6a23e4e547. | |||||
| * | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 100 | -409/+871 | |
| |\| | ||||||
| | * | Ensure HTTP Digest auth uses appropriate HTTP method [#2490 state:resolved] ↵ | Pratik Naik | 2009-05-18 | 2 | -4/+22 | |
| | | | | | | | | | | | | [Steve Madsen] | |||||
| | * | Add missing model and fixtures to finder_test [#2671 state:resolved] | Emilio Tagua | 2009-05-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| | * | Fixed limited eager loading associations with numbers in the name [#2668 ↵ | Benjamin Floering | 2009-05-18 | 5 | -2/+11 | |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| | * | Report errors in 'all project' rake tasks [#2224 state:resolved] | Kerry Buckley | 2009-05-18 | 1 | -1/+3 | |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| | * | load the JSON Backend lazily. If the JSON gem is already loaded, use the ↵ | rick | 2009-05-17 | 4 | -5/+17 | |
| | | | | | | | | | | | | JSONGem backend by default. | |||||
| | * | Allow ParamsParser to parse YAML from the request body IO directly | Brian Lopez | 2009-05-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| | * | Fix reset_session with ActiveRecord store [#2200 state:resolved] | Joshua Peek | 2009-05-17 | 2 | -4/+12 | |
| | | | ||||||
| | * | replace the aaa_create_tables_test hack with loading test database schema in ↵ | Mislav Marohnić | 2009-05-17 | 4 | -31/+22 | |
| | | | | | | | | | | | | | | | | | | the test helper [#2663 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| | * | Extract generic callbacks middleware from dispatcher | Joshua Peek | 2009-05-17 | 7 | -79/+103 | |
| | | | ||||||
| | * | 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 | |||||
| | * | | 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 | |
| | | | | ||||||
| * | | | Active Support dependencies | Jeremy Kemper | 2009-05-14 | 2 | -0/+2 | |
| | |/ | |/| | ||||||
| * | | 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 | |
| | | |