Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Add comments about bcrypt-ruby gem to SecurePassword | Guillermo Iguaran | 2011-09-03 | 1 | -0/+6 | |
| | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-02 | 1 | -1/+1 | |
|\ | ||||||
| * | Fix typo in ActiveModel::Dirty comment. define_attribute_methods is a class ↵ | Josh Nesbitt | 2011-09-02 | 1 | -1/+1 | |
| | | | | | | | | method, not attribute. | |||||
* | | Remove hard dependency on bcrypt. | Guillermo Iguaran | 2011-09-02 | 1 | -2/+3 | |
|/ | ||||||
* | Merge pull request #2563 from bogdan/internal_validation | José Valim | 2011-08-25 | 11 | -6/+42 | |
|\ | | | | | Implemented strict validation concept | |||||
| * | Typo fix | Bogdan Gusiev | 2011-08-25 | 1 | -1/+1 | |
| | | ||||||
| * | Implemented strict validation concept | Bogdan Gusiev | 2011-08-17 | 11 | -6/+42 | |
| | | | | | | | | | | | | | | In order to deliver debug information to dev team instead of display error message to end user Implemented strict validation concept that suppose to define validation that always raise exception when fails | |||||
* | | added missing require array/wrap in serialization | Anand | 2011-08-23 | 1 | -0/+2 | |
|/ | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-16 | 1 | -1/+1 | |
|\ | ||||||
| * | fix misleading comment (originally made by Tate Johnson, we lost this commit ↵ | Vijay Dev | 2011-08-14 | 1 | -1/+1 | |
| | | | | | | | | while porting to the rails repo) | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-13 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | ||||||
| * | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer | Bogdan Gusiev | 2011-08-13 | 1 | -0/+5 | |
| | | | | | | | | | | | | 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 | 3 | -10/+10 | |
| | | | | | | | | File#to_path and similar. | |||||
| * | 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 | 3 | -5/+39 | |
| | | | | | | | | | | | | Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances. | |||||
| * | Handle the empty array correctly. | thedarkone | 2011-08-13 | 1 | -1/+1 | |
| | | ||||||
* | | Allow ActiveRecord observers to be disabled. | Myron Marston | 2011-08-12 | 1 | -2/+2 | |
| | | | | | | We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on. | |||||
* | | Merge pull request #2385 from bogdan/test_default_sanitizer2 | José Valim | 2011-08-01 | 1 | -0/+5 | |
|\ \ | | | | | | | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer | |||||
| * | | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer | Bogdan Gusiev | 2011-07-28 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | 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 | 3 | -10/+10 | |
| | | | | | | | | | | | | File#to_path and similar. | |||||
* | | | 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 | 3 | -5/+39 | |
|\ \ \ | | | | | | | | | Allow ActiveModel-compatible instances to define their own partial paths | |||||
| * | | | Let ActiveModel instances define partial paths. | Grant Hutchins & Peter Jaros | 2011-07-25 | 3 | -5/+39 | |
| |/ / | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | Improve AM::Errors#include? | |||||
| * | | Handle the empty array correctly. | thedarkone | 2011-07-27 | 1 | -1/+1 | |
| |/ | ||||||
* / | 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 | 1 | -1/+1 | |
|\ | ||||||
| * | 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 | 2 | -9/+77 | |
|\ \ | | | | | | | ActiveModel support for the :include serialization option | |||||
| * | | ActiveModel support for the :include serialization option | John Firebaugh | 2011-07-17 | 2 | -1/+72 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | ||||||
| * | | serializable_hash(:only => [], :methods => [:foo]) should work | John Firebaugh | 2011-07-17 | 1 | -7/+4 | |
| |/ | ||||||
* | | 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 | 1 | -5/+17 | |
| | ||||||
* | 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 | 1 | -1/+1 | |
| | ||||||
* | 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 | 1 | -2/+8 | |
| | ||||||
* | 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 | |
| | | ||||||
* | | Get rid of the alternate namespace lookup. | José Valim | 2011-06-11 | 2 | -7/+5 | |
|/ | ||||||
* | Brought back alternative convention for namespaced models in i18n. | thoefer | 2011-06-08 | 2 | -5/+7 | |
| | ||||||
* | 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 | |
| | |