aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Collapse)AuthorAgeFilesLines
* Resurrecting 1.9 compatibility.Carl Lerche & Yehuda Katz2009-04-133-2/+4
|
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-1348-408/+786
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| * Hash::XML_TYPE_NAMES: no longer a need for a TimeWithZone entry; this class ↵Geoff Buesing2009-04-051-2/+1
| | | | | | | | will now match "Time"
| * TimeWithZone.name returns 'Time', to further thwart type checkingGeoff Buesing2009-04-051-0/+5
| |
| * Nicer name for anonymous local cache middleware classJoshua Peek2009-04-021-0/+5
| |
| * Time.local instances: Adding 24.hours across the DST boundary adds 24 hours ↵Michael Curtis2009-03-291-11/+3
| | | | | | | | instead of one day [#2066 state:resolved]
| * Merge docrailsPratik Naik2009-03-161-1/+1
| |
| * Prepare for final 2.3 releaseDavid Heinemeier Hansson2009-03-151-1/+1
| |
| * Use xmlschema when serializing TimeWithZones to xml [#2223 state:resolved]Jonathan del Strother2009-03-121-2/+3
| | | | | | | | | | | | When using Hash#to_xml, any TimeWithZone objects now use xmlschema (iso8601), rather than a simple TimeWithZone#to_s. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure HWIA#reverse_merge! retrurns HWIA [#421 state:resolved]Bradford Folkens2009-03-121-0/+6
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Reverted affe50105f7027a44eb6e9cfb56f5b3fc070b19b and added more JSON ↵Ubiratan Pires Alberton2009-03-111-1/+10
| | | | | | | | | | | | | | | | | | | | decoding tests. Works on Ruby 1.8 and 1.9 [#1100 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * adding more nokogiri tests and making the main rails tests passAaron Patterson2009-03-101-7/+14
| | | | | | | | | | | | [#2190 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Make Inflector#parameterize correctly squeeze multi-character separators ↵Henrik N2009-03-101-5/+7
| | | | | | | | | | | | [#1489 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * The latest trunk of Mocha > 0.9.5 which addresses issue with MiniUnit ↵Ken Collins2009-03-101-1/+6
| | | | | | | | | | | | | | | | compatibility uses namespaced integration classes. [#2060 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Make it easier to swap XmlMini backends. Require Nokogiri >= 1.1.1 for ↵Jeremy Kemper2009-03-102-9/+21
| | | | | | | | XmlMini backend tests.
| * Nokogiri backend for XmlMiniAaron Patterson2009-03-102-0/+71
| | | | | | | | | | | | [#2190 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Properly set up libxml includes. Don't include LibXML in toplevel.Jeremy Kemper2009-03-101-7/+9
| | | | | | | | [#2084 state:resolved]
| * Remove untested part from 9b9b2937ce3bef3bca9d22821e76c40cc74fa689Pratik Naik2009-03-101-10/+2
| |
| * Properly decode \u escape sequences in JSON [#1100 state:resolved] [Tim ↵Tim Pope2009-03-101-3/+20
| | | | | | | | | | | | Pope, Philip Hallstrom] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Use the REXML parser by default. XmlMini.backend = 'LibXML' to use libxml-ruby.Jeremy Kemper2009-03-091-6/+5
| |
| * Require libxml-ruby 0.9.4 or 0.9.7 pending a segfault bugfix for 1.0.Jeremy Kemper2009-03-093-23/+23
| | | | | | | | Delegate parsing to a switchable backend.
| * Revert "Revert "XmlMini supports different backend parsers, starting with ↵Jeremy Kemper2009-03-093-101/+246
| | | | | | | | | | | | | | | | libxml"" Will change to require a known-working libxml-ruby. This reverts commit a995a738ca10f9bef023689df70d26aad8931b9a.
| * Revert "XmlMini supports different backend parsers, starting with libxml"David Heinemeier Hansson2009-03-093-246/+101
| | | | | | | | | | | | Spews a ton undefined method `default_keep_blanks=' for XML:Module errors. This reverts commit 822c41d69d9228c9912d29ac45155d3a16bb5c50.
| * XmlMini supports different backend parsers, starting with libxmlBart ten Brinke2009-03-083-101/+246
| | | | | | | | | | | | [#2084 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Ruby 1.9 compat: rename deprecated assert_raises to assert_raise.Jeremy Kemper2009-03-082-15/+15
| | | | | | | | [#1617 state:resolved]
| * Make Chars#slice! behave more like String#slice! [#1243 state:resolved]George Ogata2009-03-071-2/+14
| | | | | | | | | | | | | | - Chars#slice! now returns the slice instead of itself - Chars#slice! now removes the slice from itself Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Allow String#parameterize to accept a separator [#2157 state:resolved]Sam Granieri2009-03-071-2/+2
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure ActiveSupport::Memoizable respects private methods. [#2138 ↵Niels Ganser2009-03-061-0/+4
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix OrderedHash#inspect recursionJeremy Kemper2009-03-041-1/+1
| |
| * Fix OrderedHash#to_hash to return self instead of a new hash with self as ↵Jeremy Kemper2009-03-031-1/+1
| | | | | | | | default value
| * Skip backtrace filters if BACKTRACE environment variable is setJeremy Kemper2009-03-031-1/+1
| |
| * Vendorize i18n 0.1.3 gem (fixes issues with incompatible character encodings ↵Sven Fuchs2009-02-2715-17/+50
| | | | | | | | | | | | in Ruby 1.9) (Akira Matsuda) [#2038 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Prep for RC2 later todayDavid Heinemeier Hansson2009-02-271-1/+1
| |
| * Force all internal calls to Array#to_sentence to use English [#2010 ↵David Heinemeier Hansson2009-02-272-4/+3
| | | | | | | | state:resolved]
| * Update bundled memcache-client from 1.5.0.5 to 1.6.4.99.Jeremy Kemper2009-02-232-131/+198
| | | | | | | | See http://www.mikeperham.com/2009/02/15/memcache-client-performance/
| * Deprecated warnings for :skip_last_command and :connector of to_sentence ↵Guillermo Álvarez2009-02-221-5/+19
| | | | | | | | | | | | [#1847 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Broaden URI.unescape fix to all affected 1.9.x by checking for broken ↵Jeremy Kemper2009-02-201-6/+12
| | | | | | | | behavior instead of specific patchlevel
| * URI.unescape fix removes the old unescape methodJeremy Kemper2009-02-201-10/+7
| |
| * Ruby 1.9.1p0's URI.decode() bug fixmoro2009-02-201-0/+13
| | | | | | | | | | | | backport to fix Ruby 1.9.1p0 bug on [ruby-dev:38005]. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Make atomic_write() puts the check_file in the cache dir, not in applicationBruno Duyé2009-02-191-1/+1
| | | | | | | | | | root [#1962 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Ruby 1.9 compat: fix JSON decoding to work properly with multibyte valuesAkira Matsuda2009-02-171-2/+3
| | | | | | | | | | | | [#1969 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Allow memcache-client versions > 1.5.x to override bundled versionJoshua Sierles2009-02-121-1/+1
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Adding inflection of databases (usually we wouldn't amend the current ↵Jiri Zajpt2009-02-121-0/+1
| | | | | | | | | | | | defaults, but this seems to obvious) [#1942 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Array#wrap should use #to_ary so association collections and named scopes ↵Will Bryant2009-02-101-2/+7
| | | | | | | | | | | | | | | | are not re-wrapped [#1935 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * TimeWithZone#advance: leverage Hash#values_at and non-block form of #any? ↵Geoff Buesing2009-02-091-1/+1
| | | | | | | | for a little less line noise, and a slight speedup (thanks raggi and Roman2K)
| * Time#to_s(:rfc822) uses #formatted_offset instead of unreliable and ↵Zachary Zolton2009-02-091-1/+1
| | | | | | | | non-standard %z directive [#1899 state:resolved]
| * TimeWithZone#advance: use #any? instead of #detectGeoff Buesing2009-02-081-1/+1
| |
| * TimeWithZone: eliminate unnecessary flattenGeoff Buesing2009-02-081-1/+1
| |
| * TimeWithZone: use Array#any? instead of detect, since we don't care about ↵Geoff Buesing2009-02-081-1/+1
| | | | | | | | the block return value
| * Make TimeWithZone#to_formatted_s an alias to TimeWithZone#to_s [#1796 ↵Levin Alexander2009-02-081-0/+1
| | | | | | | | state:resolved]