aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into testingJeremy Kemper2008-11-15102-2753/+5179
|\
| * auto_link helper: add intelligent ending closing bracket handling. add new ↵Mislav Marohnić2008-11-152-56/+94
| | | | | | | | | | | | | | tests and reorder new ones for readability Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1353 state:committed]
| * refactor autolink helper. change tests to expect HTML-escaped URLsMislav Marohnić2008-11-152-39/+44
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Moved the * strings out of construct_finder_sql to a new default_select ↵Will Bryant2008-11-151-1/+9
| | | | | | | | | | | | | | method so it can be overridden by plugins cleanly Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1371 state:resolved]
| * fix assignment to has_one :through associations.Matt Jones2008-11-157-5/+67
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Wrong referenceDavid Heinemeier Hansson2008-11-151-1/+1
| |
| * Added lambda merging to OptionMerger (especially useful with named_scope and ↵David Heinemeier Hansson2008-11-152-1/+15
| | | | | | | | with_options) [#740 state:committed] (Paweł Kondzior)
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-150-0/+0
| |\
| | * Fixed that no body charset would be set when there are attachments present ↵David Heinemeier Hansson2008-11-153-1/+12
| | | | | | | | | | | | [#740 state:commited] (Paweł Kondzior)
| * | Added lambda merging to OptionMerger (especially useful with named_scope and ↵David Heinemeier Hansson2008-11-154-1/+17
| |/ | | | | | | with_options) [#740 state:commited] (Paweł Kondzior)
| * Missing changelogs for relative_url_root changesMichael Koziarski2008-11-141-0/+2
| |
| * Missing changelog for memcache-client changesMichael Koziarski2008-11-141-0/+2
| |
| * Missing changelog for CSRF changesMichael Koziarski2008-11-141-0/+6
| |
| * Missing changelog for :only/:except on map.resourcesMichael Koziarski2008-11-141-0/+2
| |
| * Update release notes from docrails.Pratik Naik2008-11-142-2/+17
| |
| * A few more dependency updatesDavid Heinemeier Hansson2008-11-144-4/+4
| |
| * Link to 2.2.1 gemsDavid Heinemeier Hansson2008-11-141-5/+5
| |
| * Merge docrails.Pratik Naik2008-11-1450-2524/+4399
| |
| * Rails now requires rubygems 1.3.1 of higher.Pratik Naik2008-11-141-1/+1
| |
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-142-19/+40
| |\
| | * Make inheritance of map.resources :only/:except options behave more predictablyTom Stuart2008-11-142-19/+40
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | Prepare for RC2David Heinemeier Hansson2008-11-1412-18/+14
| |/
| * Make polymorphic_url compact given array [#1317 state:committed]hiroshi2008-11-143-1/+14
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Revert "Move fixtures settings from AR::TestCase to railties test_help" -- ↵David Heinemeier Hansson2008-11-142-16/+13
| | | | | | | | | | | | it broke all the tests! This reverts commit 9a88ab64bb45ddb2bdcf80fab9203111d8f8abb4.
| * Fix typo in pool_conections_test [#1350 state:committed]Amos King2008-11-141-1/+1
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Properly check silence_spec_warnings class variable [#1372 state:committed]Chris Wanstrath2008-11-141-2/+2
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Move fixtures settings from AR::TestCase to railties test_helpJeremy Kemper2008-11-132-13/+16
| |
| * Tag helper should output an attribute with the value 'false' instead of ↵Hongli Lai (Phusion)2008-11-133-5/+11
| | | | | | | | omitting the attribute, if the associated option is false but not nil.
| * Fix map.resources to always generate named routes if they're neededTom Stuart2008-11-132-6/+85
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Make sure any Fixnum returned by a DB sum is type cast to a Float before ↵Ken Collins2008-11-132-1/+6
| | | | | | | | | | | | standard converstion to a BigDecimal [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Merge branch 'master' of git@github.com:rails/railsgbuesing2008-11-135-61/+92
| |\
| | * Instead of overriding html_types, base the verification on ↵Michael Koziarski2008-11-132-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | browser_generated_types. Also Deprecate the old unverifiable types. [#1145 state:committed]
| | * fix two MimeType failing test casesrick2008-11-132-7/+10
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Changed request forgery protection to only worry about HTML-formatted ↵Jeff Cohen2008-11-134-55/+70
| | | | | | | | | | | | | | | | | | content requests. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | TimeZone: fix base offset for Sri Jayawardenepura. Anchor tests for zone ↵gbuesing2008-11-133-3/+5
| |/ | | | | | | offsets to more current date
| * TimeZone: Caracas GMT offset changed to -4:30 [#1361 state:resolved]Phil Ross2008-11-122-1/+4
| |
| * Add :only/:except options to map.resourcesTom Stuart2008-11-122-37/+247
| | | | | | | | | | | | | | This allows people with huge numbers of resource routes to cut down on the memory consumption caused by the generated code. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1215 state:committed]
| * Fixed method_missing for ActionMailer so it no longer matches methods where ↵Joel Chippindale2008-11-112-1/+6
| | | | | | | | | | | | deliver or create are not a suffix [#1318 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fix for ActionMailer::Base.method_missing so that it raises NoMethodError ↵Joel Chippindale2008-11-112-6/+16
| | | | | | | | | | | | when no method is found [#1330 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Remove redundant uniqFrederick Cheung2008-11-111-1/+1
| |
* | Remove superfluous requireJeremy Kemper2008-11-131-1/+0
| |
* | Merge branch 'master' into testingJeremy Kemper2008-11-130-0/+0
|\ \
| * | Move fixtures settings from AR::TestCase to railties test_helpJeremy Kemper2008-11-132-5/+16
| |/
* | Move fixtures settings from AR::TestCase to railties test_helpJeremy Kemper2008-11-122-19/+15
| |
* | Remove deprecated Gem.manage_gemsJeremy Kemper2008-11-121-1/+0
| |
* | Prefer a feature check to a version checkJeremy Kemper2008-11-121-1/+1
| |
* | Merge branch 'master' into testingJeremy Kemper2008-11-117-42/+69
|\|
| * Only track new constant definitions when we're reloading dependenciesJeremy Kemper2008-11-102-7/+15
| |
| * Eliminate excess Regexp creation due to capture countingJeremy Kemper2008-11-102-4/+26
| |
| * Pare down object creation during route buildingJeremy Kemper2008-11-102-30/+27
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 05:32:33 +0000