aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
...
| * Psych correctly gets visitor for SafeBuffer from superclassbrainopia2011-01-281-2/+5
| |
| * Remove unneeded yaml_as declarationbrainopia2011-01-281-2/+0
| |
| * load psych by default if possibleAaron Patterson2011-01-281-0/+5
| |
| * use ! " " YAML string literal syntax rather than removing both quotesAaron Patterson2011-01-212-7/+5
| |
| * prefering psych as the yaml parser if possible, fixing assertions for YAML ↵Aaron Patterson2011-01-213-2/+18
| | | | | | | | 1.1 compatibility
| * fixing psych support in big decimal, fixing tests to support YAML 1.1Aaron Patterson2011-01-212-4/+11
| |
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-01-201-113/+116
| |\
| | * editing comments regarding rescuable optoin in AS callbacksNeeraj Singh2011-01-121-2/+3
| | |
| | * Expand and clarify AS::Callbacks docs.John Firebaugh2011-01-091-113/+115
| | |
| | * Revert "Update CHANGELOGs to include 3.0.3 changes"Xavier Noria2011-01-021-9/+1
| | | | | | | | | | | | | | | | | | | | | Reason: Sorry, CHANGELOGs can only be edited in master. If you provide a patch I'll apply it myself. Thanks! This reverts commit 1f8ecb85d7c1b3efdf45c3cf3461502b608c1a7c.
| | * Update CHANGELOGs to include 3.0.3 changesPrem Sichanugrist2011-01-021-1/+9
| | |
| * | removing usesless variable assignmentsAaron Patterson2011-01-181-1/+5
| | |
| * | fixed a missing require that causes trouble when using AS in a non-rails env.Nick Sutterer2011-01-185-1/+6
| | |
| * | Class.__subclasses__ was removed from Rubinius.John Firebaugh2011-01-181-34/+20
| | | | | | | | | | | | | | | https://github.com/evanphx/rubinius/issues/issue/11 https://github.com/evanphx/rubinius/commit/2fccbb5dad5cb3f5414d635547290538cfc0a2d4
| * | ordering can change depending on ruby version, so parse the JSON and verify ↵Aaron Patterson2011-01-171-3/+10
| | | | | | | | | | | | data structure equality
| * | Complex struct encoding fixAlexey Nayden2011-01-151-0/+6
| | | | | | | | | | | | | | | | | | [#6077 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Complex struct encoding testAlexey Nayden2011-01-151-0/+23
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | fixing whitespace errorsAaron Patterson2011-01-121-1/+1
| | |
| * | Fixed various isolated test missing requires within AS.Josh Kalderimis2011-01-123-2/+6
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | In AS, only inflector/methods is need in proxy_wrappers.rb, as well as date, ↵Josh Kalderimis2011-01-124-4/+4
| | | | | | | | | | | | | | | | | | date_time, and time conversions.rb. This fixes an issue when requiring json and AS saying that i18n is also required. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | adding to_d to BigDecimalAaron Patterson2011-01-102-1/+10
| | |
| * | corrected docs for Hash#to_xml and added examples.Nick Sutterer2011-01-061-2/+14
| | |
| * | added tests for XmlMini#to_tag.Nick Sutterer2011-01-061-42/+81
| | |
| * | make our yaml output consistentAaron Patterson2011-01-042-6/+2
| | |
| * | add Psych::SyntaxError to the list of rescued YAML exceptionsAaron Patterson2011-01-041-1/+8
| | |
| * | test that the custom ordered hash can be round-trippedAaron Patterson2011-01-042-5/+17
| | |
| * | require Psych if possible, use Psych output when enabledAaron Patterson2011-01-041-1/+14
| | |
| * | use dots for method callsAaron Patterson2011-01-041-3/+8
| | |
| * | Implement deprecated version of AssociationReflection#primary_key_name, ↵Jon Leighton2011-01-031-1/+1
| |/ | | | | | | which has been renamed to #foreign_key. Also bumping the deprecation_horizon in Active Support to 3.1.
| * Fix Duration#to_jsonPratik Naik2010-12-292-0/+9
| |
| * while defining callbacks option :rescuable => trueNeeraj Singh2010-12-291-1/+30
| | | | | | | | | | | | | | can be passed. There were no tests for this case. This patch adds a test for :rescuable => true option.
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-234-2/+19
| |\
| | * expand on set_callback method to explain that inNeeraj Singh2010-12-211-0/+4
| | | | | | | | | | | | some cases an implicit :before is assumed
| | * Improve documentation on ActiveSupport::Deprecation.Ryan Bigg2010-12-213-2/+15
| | |
| * | Fix activesupport tests. These classes are not used anywherePiotr Sarnacki2010-12-221-12/+0
| | |
| * | Ensure that uncountable are removed after testPiotr Sarnacki2010-12-221-5/+6
| | |
| * | Added a word boundary to uncountable inflection regex for #singularize so ↵John Paul Ashenfelter2010-12-222-1/+28
| |/ | | | | | | short inflections like ors do not affect larger words like sponsors [#6093 state:resolved]
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-201-1/+1
| |\
| | * Fix the example in ActiveSupport::Concernzhengjia2010-12-171-1/+1
| | |
* | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2010-12-2016-73/+102
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/persistence.rb
| * | Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepareJohn Firebaugh2010-12-202-2/+2
| |/ | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Replace nested ifs with case/whenPavel Gorbokon2010-12-071-46/+44
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Ommit nil in method callPavel Gorbokon2010-12-071-1/+1
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-053-4/+16
| |\
| | * Remove extra fRyan Bigg2010-12-031-1/+1
| | |
| | * Add comment for config_accessor methodNeeraj Singh2010-11-301-0/+12
| | |
| | * Merge branch 'master' of https://github.com/cylence/docrails into cylence-masterAditya Sanghi2010-11-291-1/+1
| | |\
| | | * Corrected typo and wording.Ryan L. Cross2010-10-241-1/+1
| | | |
| | * | Resolves LH #6063, should be :expires_in not :expire_inAditya Sanghi2010-11-271-2/+2
| | | |
| * | | :method: is not needed when RDoc can detect itSantiago Pastorino2010-12-021-5/+0
| |/ /