Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | The trailing '/' isn't being picked up by Github anyway, and the link works ↵ | Rashmi Yadav | 2011-08-13 | 1 | -1/+1 |
| | | | | as is. | ||||
* | Fix example code for #validates_with instance method | Ben Marini | 2011-07-24 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-23 | 2 | -1/+28 |
|\ | |||||
| * | fixed type | Vishnu Atrai | 2011-07-21 | 1 | -1/+1 |
| | | |||||
| * | Download and installation, License and Support sections added for activemodel | Bratish Goswami | 2011-07-21 | 1 | -0/+27 |
| | | |||||
| * | Documentation fix: adding missing equal sign in code sample for ↵ | Sebastian Gassner | 2011-07-20 | 1 | -1/+1 |
| | | | | | | | | ActiveModel::Dirty. | ||||
* | | Merge pull request #195 from bigfix/active_model_include_serialization | José Valim | 2011-07-18 | 4 | -17/+209 |
|\ \ | | | | | | | ActiveModel support for the :include serialization option | ||||
| * | | ActiveModel support for the :include serialization option | John Firebaugh | 2011-07-17 | 4 | -9/+189 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves support for the :include serialization option for serializing associated objects out of ActiveRecord in into ActiveModel. The following methods support the :include option: * serializable_hash * to_json * to_xml Instances must respond to methods named by the values of the :includes array (or keys of the :includes hash). If an association method returns an object that is_a?(Enumerable) (which AR has_many associations do), it is assumed to be a collection association, and its elements must respond to :serializable_hash. Otherwise it must respond to :serializable_hash itself. While here, fix #858, XmlSerializer should not singularize already singular association names. | ||||
| * | | Replace map+compact with select | John Firebaugh | 2011-07-17 | 1 | -1/+1 |
| | | | |||||
| * | | Add a test | John Firebaugh | 2011-07-17 | 1 | -0/+5 |
| | | | |||||
| * | | serializable_hash(:only => [], :methods => [:foo]) should work | John Firebaugh | 2011-07-17 | 2 | -7/+14 |
| |/ | |||||
* | | Made attribute_method_matchers_cache private + doc | Lawrence Pit | 2011-07-17 | 1 | -3/+13 |
| | | |||||
* | | Issue #2075 Optimization of ActiveModel's match_attribute_method? | Lawrence Pit | 2011-07-16 | 1 | -9/+17 |
| | | |||||
* | | Optimization of ActiveModel's match_attribute_method? | Lawrence Pit | 2011-07-15 | 1 | -2/+5 |
|/ | |||||
* | Enable passing root: false to #to_json | Joe Fiorini | 2011-07-01 | 2 | -6/+69 |
| | |||||
* | Master version is 3.2.0.beta | Santiago Pastorino | 2011-06-30 | 1 | -2/+2 |
| | |||||
* | changing an attribute multiple times retains the correct original value | Ian Stewart | 2011-06-28 | 2 | -1/+10 |
| | |||||
* | Minor formating fix | Alexander Uvarov | 2011-06-24 | 1 | -2/+2 |
| | |||||
* | Follow rails convention by using Array.wrap | Alexander Uvarov | 2011-06-23 | 1 | -2/+3 |
| | |||||
* | Allow to specify mass-assignment roles as array | Alexander Uvarov | 2011-06-23 | 3 | -3/+31 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-18 | 1 | -1/+1 |
|\ | |||||
| * | Remove trailing whitespaces | Guillermo Iguaran | 2011-06-12 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1654 from ganeshkumar/test_cases | Santiago Pastorino | 2011-06-13 | 1 | -1/+0 |
|\ \ | | | | | | | removed duplicate code in tests | ||||
| * | | removed duplicate code | ganesh | 2011-06-11 | 1 | -1/+0 |
| |/ | |||||
* | | Update CHANGELOG. | José Valim | 2011-06-11 | 1 | -0/+3 |
| | | |||||
* | | Get rid of the alternate namespace lookup. | José Valim | 2011-06-11 | 3 | -17/+5 |
|/ | |||||
* | Brought back alternative convention for namespaced models in i18n. | thoefer | 2011-06-08 | 3 | -5/+17 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 4 | -16/+16 |
|\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | ||||
| * | fix incorrect output | Vijay Dev | 2011-06-04 | 1 | -1/+1 |
| | | |||||
| * | use clearer variable name in examples | Vijay Dev | 2011-06-04 | 2 | -12/+12 |
| | | |||||
| * | remove stray ( | Vijay Dev | 2011-06-03 | 1 | -1/+1 |
| | | |||||
| * | Change hashrocket spacing to match conventions. | Ben Orenstein | 2011-06-02 | 1 | -2/+2 |
| | | |||||
* | | Don't add .rb in requires | Guillermo Iguaran | 2011-05-31 | 2 | -2/+2 |
| | | |||||
* | | no need for .rb | Damien Mathieu | 2011-05-31 | 1 | -1/+1 |
| | | |||||
* | | string inflections are needed for running tests in isolation | Damien Mathieu | 2011-05-31 | 1 | -0/+1 |
| | | |||||
* | | Update CHANGELOG. | José Valim | 2011-05-31 | 1 | -0/+2 |
| | | |||||
* | | Transform the symbol into a constant lookup. | José Valim | 2011-05-31 | 3 | -29/+32 |
| | | |||||
* | | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer method | Bogdan Gusiev | 2011-05-30 | 3 | -12/+48 |
| | | | | | | | | | | In order to specify your own sanitize method Implemented .mass_assignment_sanitizer configuration option | ||||
* | | Merge pull request #1334 from bogdan/callback | José Valim | 2011-05-26 | 7 | -39/+57 |
|\ \ | |/ |/| | MassAssignmentSecurity: add ability to specify your own sanitizer | ||||
| * | MassAssignmentSecurity: add ability to specify your own sanitizer | Bogdan Gusiev | 2011-05-26 | 7 | -39/+57 |
| | | | | | | | | | | | | Added an ability to specify your own behavior on mass assingment protection, controlled by option: ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer | ||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 13 | -24/+24 |
|\ \ | |/ |/| | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | ||||
| * | Remove extra white spaces on ActiveModel docs. | Sebastian Martinez | 2011-05-23 | 13 | -24/+24 |
| | | |||||
* | | fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 | Vijay Dev | 2011-05-24 | 1 | -2/+2 |
| | | |||||
* | | Merge branch '3-1-stable' | Joshua Peek | 2011-05-22 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec | ||||
| * | | Fix I18n dependency as final is out. | José Valim | 2011-05-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1192 from arunagw/removal_extra | José Valim | 2011-05-22 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | No more need rubygems here. | ||||
| * | | | No more need rubygems here. | Arun Agrawal | 2011-05-22 | 1 | -1/+0 |
| | | | | |||||
* | | | | Move I18n dependency back to ActiveSupport. | José Valim | 2011-05-22 | 1 | -1/+0 |
| |/ / |/| | | |||||
* | | | Remove superfluous whitespace from ActiveModel::SecurePassword | Daniel Schierbeck | 2011-05-22 | 1 | -1/+1 |
| | | | | | | | | | Only one space is needed, yo! | ||||
* | | | Bump versions for rc1 | David Heinemeier Hansson | 2011-05-21 | 1 | -1/+1 |
|/ / |