aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Expand)AuthorAgeFilesLines
* `#as_json` isolates options when encoding a hash. Closes #8182Yves Senn2012-11-121-1/+1
* Match classes without to_s conversions.Nikita Afanasenko2012-11-111-10/+10
* Deprecate Hash#diff.Steve Klabnik2012-11-091-0/+1
* Merge pull request #7763 from route/full-captureCarlos Antonio da Silva2012-11-081-11/+26
|\
| * Kernel#capture replaced by version which can catch output from subprocessesDmitry Vorotilin2012-11-011-11/+26
* | fix warnings in Ruby 2.0Aaron Patterson2012-11-072-0/+4
* | mocha_standalone is now deprecated. Switch to mocha/api.Jeremy Kemper2012-11-051-1/+1
* | Remove AS::Concern extension from Testing::TaggedLoggingCarlos Antonio da Silva2012-11-051-4/+0
* | Refactor Inflector#ordinal to avoid converting the number twiceCarlos Antonio da Silva2012-11-041-2/+4
* | Use `tag!` instead of `method_missing` in `to_xml` conversions.Nikita Afanasenko2012-11-042-5/+5
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-034-9/+9
|\ \
| * | Adding a missing parenthesis in the doc of String#parameterize.Geoffrey Roguelon2012-10-241-2/+2
| * | fix output messages - docs [ci skip]Francesco Rodriguez2012-10-224-6/+6
| * | More changes around 1.9 hash syntaxAvnerCohen2012-10-212-4/+4
* | | Fixed timezone mapping of Solomon Islands.Steve Klabnik2012-11-011-1/+1
| |/ |/|
* | Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-3011-14/+17
* | Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-294-6/+12
* | atomicc.rb: Don't assume we may chown/chmod a file.Daniele Sluijters2012-10-291-2/+7
* | Replace flow-control exception with explicit test.Patrick Mahoney2012-10-271-2/+2
* | Fix queueing tests that should be consuming the queue rather than draining itJeremy Kemper2012-10-261-1/+1
* | Job consumer logs to Rails.logger by defaultJeremy Kemper2012-10-261-2/+5
* | Job worker thread logs failed jobs tooJeremy Kemper2012-10-261-1/+1
* | Job worker thread logs to stderr if no logger is providedJeremy Kemper2012-10-261-2/+1
* | Implement replace method so key? works correctly.David Graham2012-10-261-0/+8
* | Remove ActiveRecord::Model consant from AS::TestCaseCarlos Antonio da Silva2012-10-261-1/+1
* | pass the key to the block in cache.fetch on missesNoah Hendrix2012-10-231-5/+5
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-215-8/+8
|\
| * Hash Syntax changes to 1.9 formatAvnerCohen2012-10-205-9/+9
* | Make DescendantsTracker thread safe and optimize the #descendants method.thedarkone2012-10-181-19/+34
* | some ruby interpreters don't have ruby-prof so just skip the testsAaron Patterson2012-10-181-1/+1
* | Revert "remove unnecessary object/conversions file"Xavier Noria2012-10-162-2/+9
* | 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 queu...Jeremy Kemper2012-10-121-26/+0
* | Merge pull request #7007 from Mik-die/hash_extractRafael Mendonça França2012-10-121-3/+3
|\ \
| * | 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 :race_condit...Mike Evans2012-10-111-0/+4
| |/ |/|
* | Ensure expires_in and created_at timestamps aren't nil when attempting to upg...Joshua Peek2012-10-101-1/+1
* | let (array|hash)/conversions.rb load the extensions in object/to_(param|query...Xavier Noria2012-10-092-1/+5
* | 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 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.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
* | Use flat_map { } instead of map {}.flattenSantiago Pastorino2012-10-051-2/+2
* | Merge pull request #6952 from NZKoz/key_generatorMichael Koziarski2012-10-022-0/+24
|\ \ | |/ |/|
| * Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2Michael Koziarski2012-10-012-0/+24