aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2010-12-2012-73/+88
|\ | | | | | | | | | | | | | | 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
| |/ /
| * | Only convert direct hash instances in hash with indifferent access.José Valim2010-11-261-4/+3
| | |
| * | Don't depend on rubygems loading thread (for Mutex)raggi2010-11-251-0/+1
| | |
| * | class inheritable attributes is used no more! all internal use of class ↵Josh Kalderimis2010-11-201-0/+9
| | | | | | | | | | | | | | | | | | inheritable has been changed to class_attribute. class inheritable attributes has been deprecated. Signed-off-by: José Valim <jose.valim@gmail.com>
| * | I18n is always loaded on boot by Active Model or Action Pack, so no need for ↵José Valim2010-11-201-1/+0
| | | | | | | | | | | | supporting lazy hooks.
| * | applies API conventions to the RDoc of json_encodeXavier Noria2010-11-201-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | * Examples running with the text are preferred over separate Example sections. * No need to call puts, in # => we show the return value, not STDOUT. * Say explicitly that double quotes are removed. * Specify that we are talking \uXXX, rather than, say, HTML entities.
* | | We don't need to dup key, since only value is weak.Emilio Tagua2010-11-191-10/+3
| | |
* | | Use conditional to avoid warnings.Emilio Tagua2010-11-191-34/+36
| | |
* | | Use ActiveSupport::WeakHash for MRI, JRuby prefers Weakling.Emilio Tagua2010-11-191-0/+46
|/ /
* | Revert "Quick fix for not escaping []s (not ideal)"Santiago Pastorino2010-11-182-5/+3
| | | | | | | | | | | | | | | | | | According to http://www.ietf.org/rfc/rfc2616.txt and http://tools.ietf.org/rfc/rfc3986.txt [ and ] are reserved characters and should be escaped using "%" HEX HEX This reverts commit 856d2fd874d72dd9f83204affff4edfef3308361 and 1ee9b40b18a0bed5bb10a0785f7e2730bac983f6..
* | bye bye extlib_inheritable_*, AS callbacks now using class_attributeJosh Kalderimis2010-11-182-92/+13
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Update the version.rb files to include a PRE partCarl Lerche2010-11-161-2/+2
| |
* | using a merge with a Hash[] rather than a loop to add SAX parsed attributesAaron Patterson2010-11-161-2/+1
| |
* | Add support for try to just yield the object to a block if no method is to ↵raggi2010-11-141-1/+13
| | | | | | | | be called. Kind of like a tap_if_present.
* | HashWithIndifferentAccess should not change the subclass of an arrayLarry Sprock2010-11-141-1/+1
| |
* | Merge remote branch 'drogus/plugin_new'José Valim2010-11-112-0/+12
|\ \ | | | | | | | | | | | | Conflicts: railties/test/generators/app_generator_test.rb
| * | Added Hash#deep_dup function which performs deep duplication on given hashPiotr Sarnacki2010-11-022-0/+12
| |/
* | Duck typing hereSantiago Pastorino2010-11-111-1/+1
| |
* | Fix ActiveSupport::TimeWithZone#localtime method with DateTimeAlvaro Bautista2010-11-111-1/+1
| | | | | | | | | | | | [#5344 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Remove unused methodSantiago Pastorino2010-11-101-31/+0
| |
* | Remove useless cgiDenis Odorcic2010-11-102-20/+0
| | | | | | | | | | | | [#5943 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Fix FileStore cache incorrectly regenerating its key from a pathname when a ↵Denis Odorcic2010-11-071-4/+3
| | | | | | | | | | | | | | | | regexp is used in expire_fragment [#5850 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Make safe_append= live on AV::OutputBuffer not AS::SafeBufferMichael Koziarski2010-11-081-1/+0
| | | | | | | | | | | | Conflicts: actionpack/lib/action_view/template/handlers/erb.rb
* | Added support for Erubis <%== tagJan Maurits Faber2010-11-081-0/+1
| | | | | | | | | | | | | | <%== x %> is syntactic sugar for <%= raw(x) %> Signed-off-by: Michael Koziarski <michael@koziarski.com> [#5918 status:committed]
* | OrderedHash#select now preserves order [#5843 state:resolved]James A. Rosen2010-11-071-0/+2
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Ensure that HashWithIndifferentAccess duplication preserves class (for ↵laserlemon2010-11-071-2/+4
| | | | | | | | | | | | sublclasses) and default value [#5724 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | add more tests surrounding camlize in xmlmini, refactor rename_key()Aaron Patterson2010-11-031-6/+2
| |
* | Allowing to_xml :camelize option to be set to :lower to enable ↵Jeremy Holland2010-11-031-1/+7
|/ | | | lower-camelcase tags [#5903 state:resolved]
* save a few method callsAaron Patterson2010-10-221-2/+3
|
* removing wtfalseAaron Patterson2010-10-221-1/+1
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-191-0/+6
|\
| * json_escape makes json invalid doc change [#1485 state:resolved]Neeraj Singh2010-10-161-0/+6
| |
* | explains why ERB::Util#h is removed before being re-aliasedXavier Noria2010-10-181-0/+1
| |
* | replace if ! with unlessNeeraj Singh2010-10-172-2/+2
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | implements weeks_ago and prev_week for Date/DateTime/Time [#5122 ↵Rob Zolkos & Xavier Noria2010-10-162-3/+25
| | | | | | | | state:committed]
* | Revert "refactor delete a little"Aaron Patterson2010-10-151-1/+4
| | | | | | | | This reverts commit f3f34bce8fc2895e05c4a06bb4105d6155fa423d.
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-141-2/+2
|\|
| * fix time.to_formatted_time(:time) exampleAditya Sanghi2010-10-131-2/+2
| |
* | Revert "speeding up flattened version of OrderedHash.[]"Aaron Patterson2010-10-131-2/+3
| | | | | | | | This reverts commit 9c53e82d66d0c34b8f35609b7972f28521d5794d.
* | speeding up flattened version of OrderedHash.[]Aaron Patterson2010-10-131-3/+2
| |