aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
...
* | Revert "Use MiniTest in Ruby 1.8 if it is available."Carlos Antonio da Silva2012-11-132-8/+1
* | Add changelog entry for #8200 [ci skip]Carlos Antonio da Silva2012-11-131-0/+7
* | Update mocha version to 0.13.0 and change requiresCarlos Antonio da Silva2012-11-133-3/+2
* | Fix json encoding test with ruby 1.8.7 and random hash orderCarlos Antonio da Silva2012-11-131-1/+2
* | 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-133-1/+24
|/ /
* | Add release date of Rails 3.2.9 to documentationclaudiob2012-11-121-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-082-2/+14
|/
* 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-273-18/+69
* | 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-203-1/+16
* | Fix AS tests due to builder change with nil values / empty stringsCarlos Antonio da Silva2012-09-071-2/+2
|/
* CHANGELOGs are now per branchXavier Noria2012-08-281-1591/+1
* fixes a bug in dependencies.rbXavier Noria2012-08-281-1/+1
* Add html_escape note to CHANGELOGMark Turner2012-08-091-0/+2
* Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
* Add release date to CHANGELOGsSantiago Pastorino2012-08-091-1/+1
* Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
* Add CHANGELOG entrySantiago Pastorino2012-08-031-0/+2
* Fix html_escape with Ruby 1.8Rafael Mendonça França2012-08-021-15/+26
* html_escape should escape single quotesSantiago Pastorino2012-08-022-30/+18
* 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-013-23/+14
* Add missing CHANGELOG entriesSantiago Pastorino2012-08-011-2/+6
* updating release dateAaron Patterson2012-07-261-1/+1
* bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
* updating the versionAaron Patterson2012-07-231-2/+2
* updating changelogsAaron Patterson2012-07-231-0/+8
* 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
* updating changelogsAaron Patterson2012-06-121-1/+1
* bumping version numbersAaron Patterson2012-06-111-1/+1
* updating changelogsAaron Patterson2012-06-111-0/+4