aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-01-202-22/+26
|\
| * Properly indent code example blockDaniel Schierbeck2011-01-151-19/+19
| |
| * Remove reference to ActiveRecord from ActiveModel commentsbrainopia2011-01-151-3/+7
| |
* | fix difference between behaviour of blank and emptyHemant Kumar2011-01-051-1/+1
|/ | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Instance methods shouldnt be added until you actually call has_secure_passwordDavid Heinemeier Hansson2010-12-291-11/+15
|
* No need to symbolize these.José Valim2010-12-272-2/+2
|
* define_attr_method must serialize nil correctlyAaron Patterson2010-12-201-1/+1
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-201-2/+2
|\
| * 'nil' => nilAkira Matsuda2010-12-171-2/+2
| |
| * Add support for namespaced validatorsSamuel Kadolph2010-12-111-1/+7
| | | | | | | | | | | | Includes test and documentation for new feature Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Remove require AS::Concern from places where is already inSantiago Pastorino2010-12-192-2/+0
| |
* | Tests and docs which explain the use of validate with a block and without ↵Santiago Pastorino2010-12-191-1/+11
| | | | | | | | arguments
* | Remove weak_passwords list and the length/strong password validator, leave ↵Santiago Pastorino2010-12-192-35/+6
| | | | | | | | that up to the programmer
* | Use class_attribute to ensure weak_passwords are inheritable.José Valim2010-12-191-18/+8
| |
* | Add set_weak_passwords call in alignment with set_table_name.Mikel Lindsaar2010-12-191-5/+11
| |
* | Fix incorrect docsMikel Lindsaar2010-12-191-3/+1
| |
* | Added ability to specify which passwords you want as weak passwordsMikel Lindsaar2010-12-191-6/+25
| |
* | 'unsecure' => 'insecure'José Valim2010-12-192-2/+2
| |
* | Make password messages translatable.José Valim2010-12-192-2/+6
| |
* | Add missing require and remove extra module.José Valim2010-12-191-20/+19
| |
* | Avoid warnings and fix small typo on SecurePassword.José Valim2010-12-191-3/+3
| |
* | BCrypt does its own salting, lovely!David Heinemeier Hansson2010-12-181-12/+11
| |
* | Switch from SHA2 to BCrypt (easy Windows compatibility is coming shortly ↵David Heinemeier Hansson2010-12-181-7/+7
| | | | | | | | with new compiled gem)
* | Added ActiveRecord::Base#has_secure_password (via ↵David Heinemeier Hansson2010-12-181-0/+73
| | | | | | | | ActiveModel::SecurePassword) to encapsulate dead-simple password usage with SHA2 encryption and salting
* | Add support for namespaced validatorsSamuel Kadolph2010-12-161-1/+7
|/ | | | | | Includes test and documentation for new feature Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-111-14/+14
|\ | | | | | | | | Conflicts: activerecord/lib/active_record/transactions.rb
| * Move ActiveModel::Lint::Tests documentation to be above module declaration ↵Ryan Bigg2010-12-091-14/+14
| | | | | | | | so it appears in the API docs for this module.
* | Take into account current time zone when serializing datetime values [#6096 ↵Mike Dvorkin2010-12-091-0/+1
|/ | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* default could be a symbol here so attribute.to_s.humanize should be the ↵Santiago Pastorino2010-12-051-1/+2
| | | | final option
* If default is provided don't add attribute.to_s.humanize to the optionsSantiago Pastorino2010-12-051-2/+1
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-051-2/+2
|\
| * grammar fixAditya Sanghi2010-11-271-2/+2
| |
* | Don't compute this string againSantiago Pastorino2010-12-021-1/+1
| |
* | ActiveModel::Errors.to_hash returns plain OrderedHash and used in to_json ↵Thilo Utke2010-12-011-1/+7
| | | | | | | | | | | | serialization to properly handle multiple errors per attribute [#5615 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Revert "Fix generation of wrong json string when field has multiple errors"José Valim2010-12-011-10/+0
| | | | | | | | This reverts commit a9b666b51d28b2e74da630c31327dee7cbe96d37.
* | Fix generation of wrong json string when field has multiple errorsKrekoten' Marjan2010-12-011-0/+10
|/
* Update the version.rb files to include a PRE partCarl Lerche2010-11-161-2/+2
|
* Fix when database column name has some symbolic characters. [#5818 ↵Robert Pankowecki2010-11-141-5/+5
| | | | state:resolved]
* Added missing AS require to active_model/naming.rbsnusnu2010-10-301-0/+1
| | | | | | | | | | | | | | We saw a failing spec when running the DataMapper ActiveModel compliance specs for dm-active_model. ActiveModel::Naming#model_name relies on the Module#parents method defined in active_support/core_ext/module/introspection.rb Adding the appropriate require statement of course fixed our specs.
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-061-1/+1
|\
| * Fix syntax error in ActiveModel::Validations .validate examplefastred2010-10-011-1/+1
| |
* | Convert to model before calling model_name on a record in ActiveModel::NamingErnie Miller2010-10-041-1/+5
|/ | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'miloops/warnings'José Valim2010-09-271-1/+3
|\ | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/url_for.rb
| * Don't redefine existing attributes accessors.Emilio Tagua2010-09-271-1/+3
| |
* | Fix Namind#model_name.thedarkone2010-09-271-2/+4
|/
* Don't act destructively on ActiveModel::Name#human options hash. [#5366 ↵John Firebaugh2010-09-251-2/+3
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Properly interpolate i18n keys in modules [#5572 state:resolved]Rodrigo Rosenfeld Rosas2010-09-243-8/+13
|
* Better shortcut options for custom validators [#5672 state:resolved]Obie Fernandez2010-09-241-5/+10
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* resolves rdoc conflictXavier Noria2010-09-231-2/+2
|\
| * Tiny fixes to rdocAlexey Mahotkin2010-09-161-2/+2
| |