aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2012-12-231-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: CVE-2012-5664 options hashes should only be extracted if there are extra parameters updating changelog updating the changelogs updating the changelog for the CVE Add release date of Rails 3.2.9 to documentation Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activerecord/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md
| * updating the changelogsAaron Patterson2012-12-231-0/+2
| |
| * Add release date of Rails 3.2.9 to documentationclaudiob2012-12-231-1/+1
| | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md
* | Update mocha version to 0.13.0 and change requiresCarlos Antonio da Silva2012-11-131-1/+1
| |
* | Add release date of Rails 3.2.9 to documentationclaudiob2012-11-121-1/+1
|/
* Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
|
* Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
|
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
|
* Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
|
* Add 3.2.9 section in ARes CHANGELOGSantiago Pastorino2012-10-291-0/+4
| | | | [ci skip]
* 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
|
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-011-2/+2
|
* Add missing CHANGELOG entriesSantiago Pastorino2012-08-011-2/+6
| | | | [ci skip]
* 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/+4
|
* updating changelogsAaron Patterson2012-06-121-1/+1
|
* bumping version numbersAaron Patterson2012-06-111-1/+1
|
* updating changelogsAaron Patterson2012-06-111-0/+4
|
* Add release date of 3.2.5 on the CHANGELOGRafael Mendonça França2012-06-011-0/+6
|
* bumping to 3.2.5Aaron Patterson2012-05-311-1/+1
|
* bumping to 3.2.4Aaron Patterson2012-05-311-1/+1
|
* updating changelogsAaron Patterson2012-05-311-0/+4
|
* bumping to 3.2.4.rc1Aaron Patterson2012-05-281-2/+2
|
* Make sure TimeoutError is loaded.Yury Velikanau2012-05-102-1/+1
|
* Add release data to Rails 3.2.3Rafael Mendonça França2012-04-301-1/+1
|
* ARes URL should be pointed to 3-2-stable tree not master.Arun Agrawal2012-04-231-1/+1
|
* README fix! [skip ci]Arun Agrawal2012-04-101-2/+2
|
* Bump up to 3.2.3Santiago Pastorino2012-03-301-1/+1
|
* Bumping to 3.2.3.rc2Santiago Pastorino2012-03-291-1/+1
|
* Bumping to 3.2.3.rc1Santiago Pastorino2012-03-271-2/+2
|
* Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-091-0/+2
| | | | Also add missing entries and use the formating convention
* update changelogs for gems without changes too [ci skip]Vijay Dev2012-03-091-0/+8
|
* bumping to 3.2.2Aaron Patterson2012-03-011-1/+1
|
* updating RAILS_VERSIONAaron Patterson2012-02-221-2/+2
|
* fixes whitespace in CHANGELOG entriesXavier Noria2012-01-261-1/+1
|
* updating RAILS_VERSIONXavier Noria2012-01-261-1/+1
|
* CHANGELOG revision for v3.2.1Xavier Noria2012-01-261-0/+5
|
* Merge pull request #4673 from carlosantoniodasilva/validation-guides-update-3-2Vijay Dev2012-01-251-1/+1
|\ | | | | Validation guides update 3 2
| * Change ActiveRecord::Errors to ActiveModel::Errors in guidesCarlos Antonio da Silva2012-01-251-1/+1
| | | | | | | | | | | | | | Use ActiveModel::Errors in inflection example docs as well. Also fixes wrong information and link to locale file related to Errors#full_messages in I18n guide.
* | Preparing for 3.2.0 releaseDavid Heinemeier Hansson2012-01-202-2/+2
|/
* Bump to rc2Santiago Pastorino2012-01-041-1/+1
|
* fix base64 requiresSergey Nartimov2012-01-031-0/+1
|
* deprecate ActiveSupport::Base64Sergey Nartimov2012-01-031-8/+8
| | | | extend and define ::Base64 if needed
* Party like its R-C-UNO!David Heinemeier Hansson2011-12-191-1/+1
|
* fix bad nodocsVijay Dev2011-12-011-11/+21
|
* Revert "Implement ArraySerializer and move old serialization API to a new ↵José Valim2011-11-301-2/+2
| | | | | | | | | | | | | namespace." This reverts commit 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0. Conflicts: activemodel/lib/active_model.rb activemodel/lib/active_model/serializable.rb activemodel/lib/active_model/serializer.rb activemodel/test/cases/serializer_test.rb