| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-13 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile | ||||
| | * | Fixed typo | Tate Johnson | 2011-08-13 | 1 | -1/+1 |
| | | | |||||
| | * | capitalize RubyGems properl | Waynn Lue | 2011-08-13 | 1 | -1/+1 |
| | | | |||||
| | * | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer | Bogdan Gusiev | 2011-08-13 | 2 | -1/+14 |
| | | | | | | | | | | | | | In order to use StrictSanitizer in test mode Consider :id as not sensetive attribute that can be filtered from mass assignement without exception. | ||||
| | * | Rename new method to_path to to_partial_path to avoid conflicts with ↵ | José Valim | 2011-08-13 | 6 | -18/+18 |
| | | | | | | | | | File#to_path and similar. | ||||
| | * | Give attribution to Peter Jaros for the patch we paired on. | Grant Hutchins | 2011-08-13 | 1 | -1/+1 |
| | | | |||||
| | * | Update CHANGELOG. | José Valim | 2011-08-13 | 1 | -0/+2 |
| | | | |||||
| | * | Rename class method to_path to _to_path and make it explicit that it is an ↵ | José Valim | 2011-08-13 | 1 | -3/+5 |
| | | | | | | | | | internal method. | ||||
| | * | Let ActiveModel instances define partial paths. | Grant Hutchins & Peter Jaros | 2011-08-13 | 6 | -10/+62 |
| | | | | | | | | | | | | | Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances. | ||||
| | * | Handle the empty array correctly. | thedarkone | 2011-08-13 | 2 | -1/+2 |
| | | | |||||
| | * | The trailing '/' isn't being picked up by Github anyway, and the link works ↵ | Rashmi Yadav | 2011-08-13 | 1 | -1/+1 |
| | | | | | | | | | as is. | ||||
| * | | Allow ActiveRecord observers to be disabled. | Myron Marston | 2011-08-12 | 2 | -2/+14 |
| | | | | | | | We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on. | ||||
| * | | The trailing '/' isn't being picked up by Github anyway, and the link works ↵ | Rashmi Yadav | 2011-08-04 | 1 | -1/+1 |
| | | | | | | | | | as is. | ||||
| * | | Merge pull request #2385 from bogdan/test_default_sanitizer2 | José Valim | 2011-08-01 | 2 | -1/+14 |
| |\ \ | | | | | | | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer | ||||
| | * | | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer | Bogdan Gusiev | 2011-07-28 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | In order to use StrictSanitizer in test mode Consider :id as not sensetive attribute that can be filtered from mass assignement without exception. | ||||
| * | | | Rename new method to_path to to_partial_path to avoid conflicts with ↵ | José Valim | 2011-08-01 | 6 | -18/+18 |
| | | | | | | | | | | | | | File#to_path and similar. | ||||
| * | | | Give attribution to Peter Jaros for the patch we paired on. | Grant Hutchins | 2011-07-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update CHANGELOG. | José Valim | 2011-07-28 | 1 | -0/+2 |
| | | | | |||||
| * | | | Rename class method to_path to _to_path and make it explicit that it is an ↵ | José Valim | 2011-07-28 | 1 | -3/+5 |
| | | | | | | | | | | | | | internal method. | ||||
| * | | | Merge pull request #2034 from Casecommons/to_path | José Valim | 2011-07-28 | 6 | -10/+62 |
| |\ \ \ | | | | | | | | | Allow ActiveModel-compatible instances to define their own partial paths | ||||
| | * | | | Let ActiveModel instances define partial paths. | Grant Hutchins & Peter Jaros | 2011-07-25 | 6 | -10/+62 |
| | |/ / | | | | | | | | | | | | | | | | Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances. | ||||
| * | | | Merge pull request #2305 from thedarkone/errors-include | Santiago Pastorino | 2011-07-27 | 2 | -1/+2 |
| |\ \ \ | |_|/ |/| | | Improve AM::Errors#include? | ||||
| | * | | Handle the empty array correctly. | thedarkone | 2011-07-27 | 2 | -1/+2 |
| | |/ | |||||
| * / | 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 | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/activemodel