aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-09-0834-558/+490
|\
| * Fix callbacks on ActionPack.José Valim2009-09-081-1/+1
| * Refactor new callbacks and AR implementation.José Valim2009-09-0811-160/+155
| * Changed ActiveRecord to use new callbacks and speed up observers by only noti...José Valim2009-09-0827-461/+376
| * 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
|\|
| * 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
| * 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
| * Add verify and clean methods to ActiveSupport::Multibyte.Michael Koziarski2009-09-044-18/+239
| * Fix timing attack vulnerability in ActiveSupport::MessageVerifier.Coda Hale2009-09-041-3/+16
| * CookieStore should not be derived from Hash - reverting [#2268 state:resolved]Jay Pignata2009-09-031-1/+1
| * 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 stylesheet_link_...Sam Pohlenz2009-09-032-6/+64
| * 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 se...Jay Pignata2009-09-032-5/+16
| * Vendor the latest version of the bundlerCarl Lerche2009-09-0330-811/+1389
| * Add ActiveModel's ./pkg and ./doc to .gitignoreCarl Lerche2009-09-031-0/+2
| * Revert "Assert primary key does not exist in habtm when the association is de...Jeremy Kemper2009-09-025-15/+44
| * Kill AMo observing wrap_with_notifications since ARes was only using itJoshua Peek2009-09-022-18/+12
| * Don't try to log protected attribute removal if there's no logger defined [#3...Jeffrey Hardy2009-09-021-1/+3
| * Remove ClassInheritableAttributes test case, already covered by ActiveSupport...Jeffrey Hardy2009-09-021-32/+0
| * Make Sam Ruby's test suite happyYehuda Katz2009-09-011-0/+4
| * Fix the */* with Net::HTTP bug [#3100 state:resolved]Yehuda Katz + Carl Lerche2009-09-013-26/+16
| * Add required dependencies on activemodelCarl Lerche2009-09-0110-11/+23
| * Merge branch 'master' of git@github.com:rails/railsCarl Lerche2009-09-01161-6362/+992
| |\
| * | Make sure all needed files get added to the rails gemCarl Lerche2009-08-291-1/+1
* | | Merge commit 'rails/master'Emilio Tagua2009-09-01164-6353/+1140
|\ \ \ | | |/ | |/|
| * | Assert primary key does not exist in habtm when the association is defined, i...José Valim2009-09-015-45/+16
| * | ActionPack test helpers need to activate rack gemJoshua Peek2009-09-013-3/+11
| * | Railties test helpers need to activate rack gemJoshua Peek2009-09-013-1/+10
| * | Rails::Info doesn't require version for unwanted frameworksGeoff Buesing2009-09-011-2/+4