aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Expand)AuthorAgeFilesLines
...
* Enable passing root: false to #to_jsonJoe Fiorini2011-07-012-6/+69
* Master version is 3.2.0.betaSantiago Pastorino2011-06-301-2/+2
* changing an attribute multiple times retains the correct original valueIan Stewart2011-06-282-1/+10
* Minor formating fixAlexander Uvarov2011-06-241-2/+2
* Follow rails convention by using Array.wrapAlexander Uvarov2011-06-231-2/+3
* Allow to specify mass-assignment roles as arrayAlexander Uvarov2011-06-233-3/+31
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-181-1/+1
|\
| * Remove trailing whitespacesGuillermo Iguaran2011-06-121-1/+1
* | Merge pull request #1654 from ganeshkumar/test_casesSantiago Pastorino2011-06-131-1/+0
|\ \
| * | removed duplicate codeganesh2011-06-111-1/+0
| |/
* | Update CHANGELOG.José Valim2011-06-111-0/+3
* | Get rid of the alternate namespace lookup.José Valim2011-06-113-17/+5
|/
* Brought back alternative convention for namespaced models in i18n.thoefer2011-06-083-5/+17
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-064-16/+16
|\
| * fix incorrect outputVijay Dev2011-06-041-1/+1
| * use clearer variable name in examplesVijay Dev2011-06-042-12/+12
| * remove stray (Vijay Dev2011-06-031-1/+1
| * Change hashrocket spacing to match conventions.Ben Orenstein2011-06-021-2/+2
* | Don't add .rb in requiresGuillermo Iguaran2011-05-312-2/+2
* | no need for .rbDamien Mathieu2011-05-311-1/+1
* | string inflections are needed for running tests in isolationDamien Mathieu2011-05-311-0/+1
* | Update CHANGELOG.José Valim2011-05-311-0/+2
* | Transform the symbol into a constant lookup.José Valim2011-05-313-29/+32
* | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer methodBogdan Gusiev2011-05-303-12/+48
* | Merge pull request #1334 from bogdan/callbackJosé Valim2011-05-267-39/+57
|\ \ | |/ |/|
| * MassAssignmentSecurity: add ability to specify your own sanitizerBogdan Gusiev2011-05-267-39/+57
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2513-24/+24
|\ \ | |/ |/|
| * Remove extra white spaces on ActiveModel docs.Sebastian Martinez2011-05-2313-24/+24
* | fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0Vijay Dev2011-05-241-2/+2
* | Merge branch '3-1-stable'Joshua Peek2011-05-221-0/+1
|\ \
| * | Fix I18n dependency as final is out.José Valim2011-05-221-1/+1
* | | Merge pull request #1192 from arunagw/removal_extraJosé Valim2011-05-221-1/+0
|\ \ \
| * | | No more need rubygems here.Arun Agrawal2011-05-221-1/+0
* | | | Move I18n dependency back to ActiveSupport.José Valim2011-05-221-1/+0
| |/ / |/| |
* | | Remove superfluous whitespace from ActiveModel::SecurePassword Daniel Schierbeck2011-05-221-1/+1
* | | Bump versions for rc1David Heinemeier Hansson2011-05-211-1/+1
|/ /
* | Merge pull request #1180 from Karunakar/documentation_changeXavier Noria2011-05-211-1/+1
|\ \
| * | ActionMailer deliver method Documentation corrected Ticket #761Ganesh Kumar2011-05-211-1/+1
* | | Merge pull request #1165 from arunagw/rubyforge_removeJosé Valim2011-05-211-1/+0
|\ \ \ | |/ / |/| |
| * | Not updating rubyforge for new versions. Result of "gem list -d rails" is not...Arun Agrawal2011-05-201-1/+0
* | | Specify the name to be used for ActiveModel::Name fixes #1168Yves Senn2011-05-202-3/+41
|/ /
* / Prefer each instead of for inGuillermo Iguaran2011-05-191-3/+1
|/
* Attributes with :string type should not be given the type passed in model ser...Jim Herzberg2011-05-182-2/+8
* Remove unneeded merge with default false optionsAkira Matsuda2011-05-161-4/+0
* Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use it...Akira Matsuda2011-05-161-2/+2
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-141-4/+4
|\
| * Improve doc styles for ActiveModel::ConversionSebastian Martinez2011-05-041-4/+4
* | Follow code conventions on some testsSebastian Martinez2011-05-104-29/+29
* | Merge pull request #493 from guilleiguaran/changelog-fixesAaron Patterson2011-05-101-1/+30
|\ \
| * | Merging 3.0.x CHANGELOGsGuillermo Iguaran2011-05-101-1/+30