Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Raise an exception with friendlier error message when attempting to build a ↵ | Mike Breen | 2009-09-12 | 3 | -1/+16 | |
| | | | | | | | | | | | | | | | | | | polymorphic belongs_to with accepts_nested_attributes_for. [#2318 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | |||||
| * | | Memoize in the endpoint. | Yehuda Katz | 2009-09-12 | 3 | -100/+11 | |
| | | | ||||||
| * | | Get ActionPack's test running on bundled gems. This should make running ↵ | Yehuda Katz | 2009-09-12 | 12 | -12/+127 | |
| | | | | | | | | | | | | tests on new machines, as well as CI, work well. | |||||
| * | | Revert "ruby 1.9 friendly secure_compare" because it breaks CI and Sam ↵ | Yehuda Katz | 2009-09-12 | 1 | -6/+9 | |
| | | | | | | | | | | | | | | | | | | Ruby's suite This reverts commit 5de75398c495f109772b622291362a98bc6c21d1. | |||||
| * | | Add per-controller middleware | Yehuda Katz | 2009-09-12 | 2 | -1/+91 | |
| |/ | ||||||
| * | Fix habtm associations when using multiple databases | sdsykes | 2009-09-12 | 1 | -2/+2 | |
| | | | | | | | | | | | | [#3128] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Revert "Allow frameworks to be required by their gem name" | Jeremy Kemper | 2009-09-12 | 6 | -6/+0 | |
| | | | | | | | | | | | | | | This has just been confusing. Better to educate than band-aid. This reverts commit 18a24274ec823ded4ffa29bf33fd3d76816aab7e. Originally from http://dev.rubyonrails.org/ticket/8845 [drnic] | |||||
| * | Ruby 1.9 compat: Avoid using the return value of FileUtils.mkdir_p, as it ↵ | Akira Matsuda | 2009-09-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | does not return a String but an Array in Ruby 1.9 [#2018 state:committed milestone:2.3.5] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Ensure validation errors to be ordered in declared order | Akira Matsuda | 2009-09-11 | 2 | -1/+18 | |
| | | | | | | | | | | | | [#2301 state:committed milestone:2.3.5] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Fix default_error_messages back to the original message | Akira Matsuda | 2009-09-11 | 1 | -3/+6 | |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | ruby 1.9 friendly secure_compare | Jakub Kuźma | 2009-09-12 | 1 | -9/+6 | |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | Removed the copyright notice not to show it in the result of 'ri ActiveRecord'. | Shugo Maeda | 2009-09-11 | 1 | -22/+0 | |
| | | ||||||
| * | Add gem load paths after loading environment | Joshua Peek | 2009-09-11 | 1 | -9/+9 | |
| | | ||||||
| * | Fix filtering parameters when there are Fixnum or other un-dupable values. | Nathaniel Talbott | 2009-09-10 | 2 | -1/+2 | |
| | | | | | | | | | | | | [#3184 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Remove redundant checks for valid character regexp in ↵ | Beau Harrington | 2009-09-10 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | ActiveSupport::Multibyte#clean and #verify. [#3181 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 34 | -558/+490 | |
|\| | ||||||
| * | Fix callbacks on ActionPack. | José Valim | 2009-09-08 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | |||||
| * | Refactor new callbacks and AR implementation. | José Valim | 2009-09-08 | 11 | -160/+155 | |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | Changed ActiveRecord to use new callbacks and speed up observers by only ↵ | José Valim | 2009-09-08 | 27 | -461/+376 | |
| | | | | | | | | | | | | notifying events that are actually being consumed. Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | Ruby 1.9: fix MessageVerifier#secure_compare | Jeremy Kemper | 2009-09-08 | 1 | -9/+27 | |
| | | ||||||
| * | Please 1.8.6 CI | Joshua Peek | 2009-09-07 | 1 | -0/+3 | |
| | | ||||||
| * | Start running AS isolated tests on CI | Joshua Peek | 2009-09-07 | 1 | -0/+1 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 101 | -1239/+2115 | |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | |||||
| * | Use draw/connect mapper api instead of directly using add_named_route | Joshua Peek | 2009-09-06 | 1 | -12/+34 | |
| | | ||||||
| * | Need to reset session for AR session tests after altering the route set | Joshua Peek | 2009-09-06 | 1 | -0/+1 | |
| | | ||||||
| * | Add fake controllers for url rewriter tests | Joshua Peek | 2009-09-06 | 2 | -0/+6 | |
| | | ||||||
| * | Cleanup hacky routing with controller_path in url helper tests. This doesn't ↵ | Joshua Peek | 2009-09-06 | 3 | -64/+58 | |
| | | | | | | | | work in real life anyway. | |||||
| * | Need to reset session in internal integration tests after altering the route set | Joshua Peek | 2009-09-06 | 1 | -0/+1 | |
| | | ||||||
| * | Fix isolated running of AddressesTest | Joshua Peek | 2009-09-06 | 2 | -6/+3 | |
| | | ||||||
| * | Fix isolated running of ActionPackAssertionTest | Joshua Peek | 2009-09-06 | 2 | -1/+2 | |
| | | ||||||
| * | Fix failing isolated routing test | Joshua Peek | 2009-09-05 | 1 | -16/+16 | |
| | | ||||||
| * | Fix failing ARes isolated tests | Joshua Peek | 2009-09-05 | 3 | -2/+6 | |
| | | ||||||
| * | Fix warnings in AMo | Joshua Peek | 2009-09-05 | 8 | -51/+10 | |
| | | ||||||
| * | Fix failing AMo isolated tests | Joshua Peek | 2009-09-05 | 4 | -0/+7 | |
| | | ||||||
| * | Fix failing AS isolated tests | Joshua Peek | 2009-09-05 | 4 | -3/+14 | |
| | | ||||||
| * | Turn warnings on for AS isolated tests | Joshua Peek | 2009-09-05 | 1 | -1/+1 | |
| | | ||||||
| * | Fix a messed up merge commit | Michael Koziarski | 2009-09-04 | 1 | -4/+0 | |
| | | ||||||
| * | Clean tag attributes before passing through the escape_once logic. | Michael Koziarski | 2009-09-04 | 1 | -1/+1 | |
| | | | | | | | | Addresses CVE-2009-3009 | |||||
| * | Add verify and clean methods to ActiveSupport::Multibyte. | Michael Koziarski | 2009-09-04 | 4 | -18/+239 | |
| | | | | | | | | | | | | | | | | | | | | | | | | When accepting character input from outside of your application you can't blindly trust that all strings are properly encoded. With these methods you can check incoming strings and clean them up if necessary. Signed-off-by: Michael Koziarski <michael@koziarski.com> Conflicts: activesupport/lib/active_support/multibyte.rb | |||||
| * | Fix timing attack vulnerability in ActiveSupport::MessageVerifier. | Coda Hale | 2009-09-04 | 1 | -3/+16 | |
| | | | | | | | | | | | | Use a constant-time comparison algorithm to compare the candidate HMAC with the calculated HMAC to prevent leaking information about the calculated HMAC. Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | CookieStore should not be derived from Hash - reverting [#2268 state:resolved] | Jay Pignata | 2009-09-03 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | Test for previous commit (we wrote it first, I swear) | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -0/+18 | |
| | | ||||||
| * | Replace :formats => ["*/*"] with the default formats set | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -0/+2 | |
| | | ||||||
| * | Refactor ActionController to use find_template and template_exists? | Yehuda Katz + Carl Lerche | 2009-09-03 | 5 | -10/+14 | |
| | | ||||||
| * | Don't raise exceptions for missing javascript_include_tag or ↵ | Sam Pohlenz | 2009-09-03 | 2 | -6/+64 | |
| | | | | | | | | | | | | stylesheet_link_tag sources unless the :cache or :concat options are given. [#2738 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | Remove a useless method in the fixture template class | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -4/+0 | |
| | | ||||||
| * | Refactor ActionView::Resolver | Yehuda Katz + Carl Lerche | 2009-09-03 | 8 | -134/+116 | |
| | | ||||||
| * | Extract finding the template in AC to it's own method | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -3/+5 | |
| | | ||||||
| * | If session_options[:id] is requested when using CookieStore, unmarshal the ↵ | Jay Pignata | 2009-09-03 | 2 | -5/+16 | |
| | | | | | | | | | | | | session to access it [#2268 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | Vendor the latest version of the bundler | Carl Lerche | 2009-09-03 | 30 | -811/+1389 | |
| | |