aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-12-101-0/+1
* Use send in Time marshal extensions since the methods are now privateCarlos Antonio da Silva2012-12-031-2/+2
* Fixed description for ActiveSupport::Concern typical caseDmitry Vorotilin2012-11-301-1/+3
* Revert "Use MiniTest in Ruby 1.8 if it is available."Carlos Antonio da Silva2012-11-131-3/+1
* Update mocha version to 0.13.0 and change requiresCarlos Antonio da Silva2012-11-132-2/+1
* Merge pull request #8200 from freerange/3-2-stable-with-mocha-fixesCarlos Antonio da Silva2012-11-133-5/+11
|\
| * Avoid a Mocha deprecation warning.James Mead2012-11-131-1/+1
| * Fix for Test::Unit Mocha compatibility.James Mead2012-11-131-3/+5
| * Use MiniTest in Ruby 1.8 if it is available.James Mead2012-11-131-1/+3
| * Copy Mocha bug fix.James Mead2012-11-131-0/+2
* | backport #8185, `#as_json` isolates options when encoding a hash.Yves Senn2012-11-131-1/+1
|/
* Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-121-1/+1
|\
| * Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-091-1/+1
|\|
| * Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
* | Merge pull request #8027 from daenney/masterXavier Noria2012-11-081-2/+7
|/
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
* Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
* Merge pull request #8022 from GRoguelon/3-2-stableRafael Mendonça França2012-10-241-1/+1
|\
| * Adding a missing parenthesis in the doc of String#parameterize.Geoffrey Roguelon2012-10-241-1/+1
* | Shush syntax warningsJeremy Kemper2012-09-281-3/+3
* | Add logger.push_tags and .pop_tags to complement logger.taggedJeremy Kemper2012-09-271-18/+28
* | Fix invalid ruby 1.8 syntaxRafael Mendonça França2012-09-211-4/+5
* | Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z for...kennyj2012-09-201-1/+4
|/
* fixes a bug in dependencies.rbXavier Noria2012-08-281-1/+1
* Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
* Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
* Fix html_escape with Ruby 1.8Rafael Mendonça França2012-08-021-15/+26
* html_escape should escape single quotesSantiago Pastorino2012-08-021-28/+16
* Fix ActiveSupport integration with Mocha > 0.12.1Mike Gunderloy2012-08-021-1/+3
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-011-2/+2
* Revert "Deprecate ActiveSupport::JSON::Variable"Rafael Mendonça França2012-08-011-9/+1
* bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
* updating the versionAaron Patterson2012-07-231-2/+2
* Hash#fetch(fetch) is not the same as doing hash[key]Xavier Noria2012-07-211-1/+11
* adds a missing require [fixes #6896]Xavier Noria2012-07-152-1/+1
* make sure the inflection rules are loaded when cherry-picking active_support/...Xavier Noria2012-06-293-0/+5
* Merge pull request #6857 from rsutphin/as_core_ext_time_missing_requireCarlos Antonio da Silva2012-06-251-0/+1
* bump AS deprecation_horizon to 4.0Francesco Rodríguez2012-06-171-2/+2
* bumping version numbersAaron Patterson2012-06-111-1/+1
* Merge pull request #6688 from c42engineering/buffered_logger_level_while_crea...Rafael Mendonça França2012-06-101-2/+2
|\
| * buffered logger is initialized with the log level passed trough the initializerNiranjan Paranjape2012-06-091-2/+2
* | fix namespace collision with test-unit-activesupportJens Kraemer2012-06-101-1/+1
|/
* bumping to 3.2.5Aaron Patterson2012-05-311-1/+1
* Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-05-311-1/+1
|\
| * bumping to 3.2.4Aaron Patterson2012-05-311-1/+1
* | Merge branch '3-2-stable-sec' into 3-2-stableAaron Patterson2012-05-311-2/+2
|\|
| * bumping to 3.2.4.rc1Aaron Patterson2012-05-281-2/+2
* | Deprecate ActiveSupport::JSON::VariableErich Menge2012-05-301-1/+9
* | True, False, and Nil should be represented in as_json as themselves.Erich Menge2012-05-301-6/+6