aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
Commit message (Collapse)AuthorAgeFilesLines
* Revert "remove unnecessary object/conversions file"Xavier Noria2012-10-162-2/+9
| | | | | | | This file is used at least by Active Merchant, its existence is maybe not necessary but no big deal either. This reverts commit ae9b3d7cecd77b9ace38671b183e1a360bf632b6.
* Backpedal from class-oriented config.queue. Set an actual queue instance.Jeremy Kemper2012-10-121-4/+0
|
* Remove the queue container. Premature consolidation. Set up and maintain ↵Jeremy Kemper2012-10-121-26/+0
| | | | queues in the classes that use them instead.
* Merge pull request #7007 from Mik-die/hash_extractRafael Mendonça França2012-10-121-3/+3
|\ | | | | make Hash#extract! more symmetric with Hash#slice
| * make Hash#extract! more symmetric with Hash#sliceMikhail Dieterle2012-10-081-3/+3
| |
* | Padding expires_in by 5 minutes on dalli key write to facilitate ↵Mike Evans2012-10-111-0/+4
| | | | | | | | :race_condition_ttl working correctly.
* | Ensure expires_in and created_at timestamps aren't nil when attempting to ↵Joshua Peek2012-10-101-1/+1
| | | | | | | | upgrade cache
* | let (array|hash)/conversions.rb load the extensions in ↵Xavier Noria2012-10-092-1/+5
| | | | | | | | object/to_(param|query).rb
* | keys.include? -> key?Xavier Noria2012-10-091-1/+1
| |
* | Merge pull request #7817 from NARKOZ/object-conversionsXavier Noria2012-10-092-9/+2
|\ \ | |/ |/| remove unnecessary object/conversions file
| * remove unnecessary object/conversions fileNihad Abbasov2012-10-022-9/+2
| |
* | explains why these requires are in an unusual placeXavier Noria2012-10-071-0/+8
| |
* | Merge pull request #7650 from kennyj/fix_warning_20120915Xavier Noria2012-10-071-6/+7
|\ \ | | | | | | Fix warning: circular require considered harmful.
| * | Fix warning: circular require considered harmful.kennyj2012-10-031-6/+7
| |/
* | rename private method to avoid overridingFrancesco Rodriguez2012-10-061-2/+2
| |
* | use Rails backtrace in testsFrancesco Rodriguez2012-10-051-0/+1
| |
* | Revert "Use flat_map { } instead of map {}.flatten"Santiago Pastorino2012-10-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | This reverts commit abf8de85519141496a6773310964ec03f6106f3f. We should take a deeper look to those cases flat_map doesn't do deep flattening. irb(main):002:0> [[[1,3], [1,2]]].map{|i| i}.flatten => [1, 3, 1, 2] irb(main):003:0> [[[1,3], [1,2]]].flat_map{|i| i} => [[1, 3], [1, 2]]
* | Use flat_map { } instead of map {}.flattenSantiago Pastorino2012-10-051-2/+2
| |
* | Merge pull request #6952 from NZKoz/key_generatorMichael Koziarski2012-10-021-0/+23
|\ \ | |/ |/| Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2
| * Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2Michael Koziarski2012-10-011-0/+23
| | | | | | | | | | | | This will be used to derive keys from the secret and a salt, in order to allow us to do things like encrypted cookie stores without using the secret for multiple purposes directly.
* | fix broken cache testsBrian Durand2012-09-301-2/+2
|/
* Optimize ActiveSupport::Cache::Entry to reduce memory and processing overhead.Brian Durand2012-09-302-63/+86
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-282-2/+22
|\ | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * Improve documentation for subscribe blockGrant Hutchins & Sabrina Staedt2012-09-271-1/+11
| |
| * String.to_time documentation along examples.Adam Stankiewicz2012-09-241-1/+11
| |
* | ConstantLookup is not needed in every TestCase decendantAndy Lindeman2012-09-261-1/+0
| |
* | Tests tag the Rails log with the current test class and test caseJeremy Kemper2012-09-262-0/+32
| |
* | Allow wrapping a logger that hasn't set a formatter. Default to our ↵Jeremy Kemper2012-09-261-2/+4
| | | | | | | | SimpleFormatter. Otherwise we try extending nil with the tagging API.
* | Add logger.push_tags and .pop_tags to complement logger.taggedJeremy Kemper2012-09-261-14/+28
| |
* | Add missing inflector dependencyMike Moore2012-09-251-3/+2
| |
* | Create ActiveSupport::Testing::ConstantLookupMike Moore2012-09-242-0/+55
| | | | | | | | | | AS::TC::ConstantLookup walks the test's name to find the constant it is describing. This additional lookup logic is needed to better support minitest's spec DSL.
* | Raise the same exception the code is handlingSantiago Pastorino2012-09-211-1/+1
|/
* Update examples in AS::Concern to use correct scope syntax. [ci skip]José Corcuera2012-09-211-2/+2
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-2179-873/+984
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes.
| * Fix indentation and update documentation for Array#wrap for Ruby 1.9Jo Liss2012-09-201-9/+10
| |
| * fix Hash#slice code example [ci skip]Francesco Rodriguez2012-09-181-1/+1
| |
| * update AS docs [ci skip]Francesco Rodriguez2012-09-1723-329/+378
| |
| * fix AS::OrderedOptions documentation [ci skip]Francesco Rodriguez2012-09-171-16/+15
| |
| * update AS/values and AS/xml_mini docs [ci skip]Francesco Rodriguez2012-09-144-39/+54
| |
| * update AS/notifications and AS/testing docs [ci skip]Francesco Rodriguez2012-09-143-8/+10
| |
| * update AS/log_subscriber and AS/multibyte docs [ci skip]Francesco Rodriguez2012-09-143-55/+76
| |
| * update AS/json docs [ci skip]Francesco Rodriguez2012-09-142-12/+20
| |
| * update AS/inflector docs [ci skip]Francesco Rodriguez2012-09-143-142/+167
| |
| * update AS/deprecation docs [ci skip]Francesco Rodriguez2012-09-142-9/+9
| |
| * add :nodoc: to AS::Autoload#extended [ci skip]Francesco Rodriguez2012-09-141-2/+1
| |
| * fix AS/core_ext examples [ci skip]Francesco Rodriguez2012-09-123-3/+3
| |
| * update AS/core_ext docs [ci skip]Francesco Rodriguez2012-09-1229-113/+121
| |
| * update some AS code examples to 1.9 hash syntax [ci skip]Francesco Rodriguez2012-09-1213-158/+142
| |
* | Update delegate docs with new hash syntax [ci skip]Carlos Antonio da Silva2012-09-201-10/+10
| |
* | Add changelog entry and docs about class delegation using the symbol :classCarlos Antonio da Silva2012-09-201-0/+12
| | | | | | | | See #7613. [ci skip]