aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-261-2/+2
|\
| * Add comment for attr_accessible/attr_protected :as option. [ci skip]Edward Tsech2012-05-251-2/+2
| |
* | Merge pull request #4785 from ↵José Valim2012-05-252-4/+26
|\ \ | |/ |/| | | | | ayamomiji/add-self-to-allow-method-name-using-ruby-keyword add `self.` to allow method name using ruby keyword
| * fix `alias_attribute` will raise a syntax error if make an alias on aayaya2012-05-142-4/+26
| | | | | | | | column that named as a ruby keyword
* | Add license field to gemspecs, by Matt GriffinMatt Griffin2012-05-231-0/+1
| |
* | changed xml type datetime to dateTime, fixes #6328Angelo capilleri2012-05-232-2/+2
| | | | | | | | | | | | | | | | | | XmlMini define the xml 'datatime', but according to http://www.w3.org/TR/xmlschema-2/#dateTime could be better change this to 'dateTime' with upper case letter 'T. So 'DateTime' and 'Time' are redefined from 'datetime' to 'dateTime' add the changing to the changelog
* | Fix the buildSantiago Pastorino2012-05-221-1/+0
| |
* | require active_support/lazy_load_hooks where is neededSantiago Pastorino2012-05-221-0/+1
| |
* | Revert "Merge pull request #5702 from oscardelben/patch-4"Piotr Sarnacki2012-05-201-1/+3
| | | | | | | | | | | | | | This reverts commit cae1ca7d1be9c79c7ef012a1f62aef9d3bb815f8, reversing changes made to da97cf016a8ffd1f54f804cd881f393e5d6efc18. These changes break the build, it needs more investigation.
* | Merge pull request #5702 from oscardelben/patch-4Piotr Sarnacki2012-05-191-3/+1
|\ \ | | | | | | Call undefine_attribute_methods only when defining new attributes
| * | Call undefine_attribute_methods only when defining new attributesOscar Del Ben2012-05-181-3/+1
| | |
* | | Merge pull request #5678 from troyk/patch-1Carlos Antonio da Silva2012-05-191-1/+1
|\ \ \ | |/ / |/| | Remove sort on attributes.keys
| * | Remove sort on attributes.keysTroy Kruthoff2012-03-301-1/+1
| | |
* | | Merge pull request #6215 from erichmenge/fix_has_secure_passwordAaron Patterson2012-05-175-15/+43
|\ \ \ | | | | | | | | Fix has secure password
| * | | Updated tests for has_secure_password.Erich Menge2012-05-084-10/+33
| | | |
| * | | has_secure_password shouldn't validate password_digest. It should also take ↵Erich Menge2012-05-081-5/+10
| | | | | | | | | | | | | | | | options to turn validations off.
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-179-101/+154
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb
| * | | | fixing removed empty lines and examplesFrancesco Rodriguez2012-05-168-6/+11
| | | | |
| * | | | fixing validates_with docsFrancesco Rodriguez2012-05-161-6/+4
| | | | |
| * | | | better format and fixes to validators docsFrancesco Rodriguez2012-05-168-104/+154
| | | | |
| * | | | better example format in validates_exclusion_of docsFrancesco Rodriguez2012-05-161-2/+2
| | | | |
* | | | | Improve logging of ActiveModel::MassAssignmentSecurity::SanitizerNaoto Takai2012-05-174-15/+28
| | | | |
* | | | | Kill whitespaces :scissors:Carlos Antonio da Silva2012-05-152-3/+3
| | | | |
* | | | | Merge pull request #6284 from acapilleri/dup_validationCarlos Antonio da Silva2012-05-152-0/+21
|\ \ \ \ \ | |/ / / / |/| | | | clean the erros if an object that includes validation is duped.
| * | | | clean the erros if an object that includes validations errors is duped. ↵Angelo Capilleri2012-05-132-0/+21
| | | | | | | | | | | | | | | | | | | | Fixes #5953
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * | | | | Missed colonAlexey Vakhov2012-05-141-1/+1
| |/ / / /
* | | | | updating define_attribute_methods documentationFrancesco Rodriguez2012-05-143-3/+3
| | | | |
* | | | | allow define_attribute_methods to pass multiple valuesFrancesco Rodriguez2012-05-142-13/+20
| | | | |
* | | | | Merge pull request #5729 from oscardelben/use_tapJosé Valim2012-05-131-5/+1
|\ \ \ \ \ | |/ / / / |/| | | | Use the more idiomatic tap method
| * | | | Use the more idiomatic tap methodOscar Del Ben2012-04-041-5/+1
| | | | |
* | | | | Remove useless load path modificationsSantiago Pastorino2012-05-112-5/+0
| | | | |
* | | | | Lazy load I18nSantiago Pastorino2012-05-111-2/+3
| | | | |
* | | | | Use respond_to?(:to_ary) rather than is_a?(Enumerable) to detect ↵Jon Leighton2012-05-114-3/+40
| |/ / / |/| | | | | | | | | | | collection-thing.
* | | | simplify the alias_attribute example [ci skip]Vijay Dev2012-05-081-20/+1
| | | |
* | | | added docs to alias_attribute methodFrancesco Rodriguez2012-05-071-0/+31
| | | |
* | | | Revert "fixing active model links in readme"Vijay Dev2012-05-071-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c962680e1902d2c9474f0be8ba7b0b8ab361cae6. Reason: The links must be relative to work in both edge and stable api sites.
* | | | removing the surrounding +s in active model readmeFrancesco Rodriguez2012-05-071-3/+3
| | | |
* | | | fixing marked actived model classes in readmeFrancesco Rodriguez2012-05-071-3/+3
| | | |
* | | | marking some active model classesFrancesco Rodriguez2012-05-071-3/+3
| | | |
* | | | fixing active model links in readmeFrancesco Rodriguez2012-05-071-10/+10
| | | |
* | | | adding observer exampleFrancesco Rodriguez2012-05-071-0/+10
| |_|/ |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-041-1/+1
|\ \ \
| * | | Fix ActiveModel README exampleAlexey Vakhov2012-05-041-1/+1
| | | |
* | | | Rakefile executable attributes and shebang lines has been removedRoman V. Babenko2012-05-021-0/+0
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-011-0/+1
|\ \ \
| * | | Add line which gives a little bit more information how *_will_change! works.Edward Tsech2012-05-011-0/+1
| | | |
* | | | notify_observers should be publicMarc-Andre Lafortune2012-04-302-21/+27
| | | |
* | | | Merge pull request #6063 from marcandre/observer_extra_argsAaron Patterson2012-04-302-11/+26
|\ \ \ \ | | | | | | | | | | Allow extra arguments for Observers
| * | | | Allow extra arguments for ObserversMarc-Andre Lafortune2012-04-302-11/+26
| | | | |