aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Expand)AuthorAgeFilesLines
* Revert "Remove unicode character encoding from ActiveSupport::JSON.encode"Rafael Mendonça França2013-05-081-1/+7
* Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-182-1/+7
|\
| * bumping to 3.2.13Aaron Patterson2013-03-181-1/+1
| * JDOM XXE Protection [CVE-2013-1856]Ben Murphy2013-03-151-0/+6
| * bumping to rc2Aaron Patterson2013-03-061-1/+1
| * Preparing for 3.2.13.rc1 releaseSteve Klabnik2013-02-271-2/+2
* | Fix `ActiveSupport::TimeZone.parse` when time is a local DST jumpAndrew White2013-03-131-6/+16
|/
* Update RUBY_VERSION check for performance testing to handle 2.0.0mikeycgto2013-02-241-1/+1
* added marshal_load and marshal_dump for ProxyTestResult. Behavior of method_m...SHIBATA Hiroshi2013-02-241-2/+10
* search private and protected methods for convert_keyAaron Patterson2013-02-243-4/+3
* Add in missing requiresPrem Sichanugrist2013-02-241-0/+2
* Merge branch '3-2-sec' into 3-2-stableAaron Patterson2013-02-111-1/+1
|\
| * bumping versionAaron Patterson2013-02-101-1/+1
* | Make tests for the presence of MiniTest consistent.James Mead2013-01-141-1/+1
* | Fix DateTime comparison with DateTime::Infinity objectDan Kubb2013-01-131-1/+1
* | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2013-01-082-8/+26
|\|
| * bumping versionAaron Patterson2013-01-081-1/+1
| * CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.Jeremy Kemper2013-01-081-7/+25
* | Wrap time ranges with timezones, closes #8807Vasiliy Ermolovich2013-01-082-11/+17
* | Merge tag 'v3.2.10' into 3-2-stableMiguel2013-01-031-1/+1
|\|
| * bumping version to 3.2.10Aaron Patterson2012-12-231-1/+1
* | Remove unicode character encoding from ActiveSupport::JSON.encodeBrett Carter2012-12-141-7/+1
* | Add :nsec format only for Ruby 1.9Carlos Antonio da Silva2012-12-111-1/+2
* | 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