aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Raise an exception with friendlier error message when attempting to build a ↵Mike Breen2009-09-123-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 Katz2009-09-123-100/+11
| | |
| * | Get ActionPack's test running on bundled gems. This should make running ↵Yehuda Katz2009-09-1212-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 Katz2009-09-121-6/+9
| | | | | | | | | | | | | | | | | | Ruby's suite This reverts commit 5de75398c495f109772b622291362a98bc6c21d1.
| * | Add per-controller middlewareYehuda Katz2009-09-122-1/+91
| |/
| * Fix habtm associations when using multiple databasessdsykes2009-09-121-2/+2
| | | | | | | | | | | | [#3128] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Revert "Allow frameworks to be required by their gem name"Jeremy Kemper2009-09-126-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 Matsuda2009-09-111-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 orderAkira Matsuda2009-09-112-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 messageAkira Matsuda2009-09-111-3/+6
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * ruby 1.9 friendly secure_compareJakub Kuźma2009-09-121-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 Maeda2009-09-111-22/+0
| |
| * Add gem load paths after loading environmentJoshua Peek2009-09-111-9/+9
| |
| * Fix filtering parameters when there are Fixnum or other un-dupable values.Nathaniel Talbott2009-09-102-1/+2
| | | | | | | | | | | | [#3184 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Remove redundant checks for valid character regexp in ↵Beau Harrington2009-09-101-2/+2
| | | | | | | | | | | | | | | | ActiveSupport::Multibyte#clean and #verify. [#3181 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge commit 'rails/master'Emilio Tagua2009-09-0834-558/+490
|\|
| * Fix callbacks on ActionPack.José Valim2009-09-081-1/+1
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Refactor new callbacks and AR implementation.José Valim2009-09-0811-160/+155
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Changed ActiveRecord to use new callbacks and speed up observers by only ↵José Valim2009-09-0827-461/+376
| | | | | | | | | | | | notifying events that are actually being consumed. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Ruby 1.9: fix MessageVerifier#secure_compareJeremy Kemper2009-09-081-9/+27
| |
| * Please 1.8.6 CIJoshua Peek2009-09-071-0/+3
| |
| * Start running AS isolated tests on CIJoshua Peek2009-09-071-0/+1
| |
* | Merge commit 'rails/master'Emilio Tagua2009-09-08101-1239/+2115
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * Use draw/connect mapper api instead of directly using add_named_routeJoshua Peek2009-09-061-12/+34
| |
| * Need to reset session for AR session tests after altering the route setJoshua Peek2009-09-061-0/+1
| |
| * Add fake controllers for url rewriter testsJoshua Peek2009-09-062-0/+6
| |
| * Cleanup hacky routing with controller_path in url helper tests. This doesn't ↵Joshua Peek2009-09-063-64/+58
| | | | | | | | work in real life anyway.
| * Need to reset session in internal integration tests after altering the route setJoshua Peek2009-09-061-0/+1
| |
| * Fix isolated running of AddressesTestJoshua Peek2009-09-062-6/+3
| |
| * Fix isolated running of ActionPackAssertionTestJoshua Peek2009-09-062-1/+2
| |
| * Fix failing isolated routing testJoshua Peek2009-09-051-16/+16
| |
| * Fix failing ARes isolated testsJoshua Peek2009-09-053-2/+6
| |
| * Fix warnings in AMoJoshua Peek2009-09-058-51/+10
| |
| * Fix failing AMo isolated testsJoshua Peek2009-09-054-0/+7
| |
| * Fix failing AS isolated testsJoshua Peek2009-09-054-3/+14
| |
| * Turn warnings on for AS isolated testsJoshua Peek2009-09-051-1/+1
| |
| * Fix a messed up merge commitMichael Koziarski2009-09-041-4/+0
| |
| * Clean tag attributes before passing through the escape_once logic.Michael Koziarski2009-09-041-1/+1
| | | | | | | | Addresses CVE-2009-3009
| * Add verify and clean methods to ActiveSupport::Multibyte.Michael Koziarski2009-09-044-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 Hale2009-09-041-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 Pignata2009-09-031-1/+1
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Test for previous commit (we wrote it first, I swear)Yehuda Katz + Carl Lerche2009-09-031-0/+18
| |
| * Replace :formats => ["*/*"] with the default formats setYehuda Katz + Carl Lerche2009-09-031-0/+2
| |
| * Refactor ActionController to use find_template and template_exists?Yehuda Katz + Carl Lerche2009-09-035-10/+14
| |
| * Don't raise exceptions for missing javascript_include_tag or ↵Sam Pohlenz2009-09-032-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 classYehuda Katz + Carl Lerche2009-09-031-4/+0
| |
| * Refactor ActionView::ResolverYehuda Katz + Carl Lerche2009-09-038-134/+116
| |
| * Extract finding the template in AC to it's own methodYehuda Katz + Carl Lerche2009-09-031-3/+5
| |
| * If session_options[:id] is requested when using CookieStore, unmarshal the ↵Jay Pignata2009-09-032-5/+16
| | | | | | | | | | | | session to access it [#2268 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Vendor the latest version of the bundlerCarl Lerche2009-09-0330-811/+1389
| |