aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-12-107-58/+86
|\
| * Typos. return -> returns. [ci skip]Lauro Caetano2013-12-031-1/+1
| * Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-241-6/+6
| |\
| | * Change syntax format for example returned valuesPrem Sichanugrist2013-11-111-6/+6
| * | Remove short circuit return in favor of simple conditionalCarlos Antonio da Silva2013-11-151-4/+7
| * | Invert conditional to avoid double checking for RegexpCarlos Antonio da Silva2013-11-151-11/+12
| * | Only check that the option exists once instead of doing on each conditionalCarlos Antonio da Silva2013-11-151-8/+9
| * | Remove argument that is accessible as attributeCarlos Antonio da Silva2013-11-151-3/+3
| * | Cache regexp source on format validation to avoid allocating new objectsCarlos Antonio da Silva2013-11-151-2/+2
| * | Make code simpler to read by using a case statementCarlos Antonio da Silva2013-11-151-2/+6
| * | Avoid a new hash allocationCarlos Antonio da Silva2013-11-151-1/+1
| * | Use a simple conditional rather than short circuit with nextCarlos Antonio da Silva2013-11-151-2/+3
| * | Simplify number parsing logic in numericality validationCarlos Antonio da Silva2013-11-151-10/+3
| * | Avoid creation of extra hash with merge just to set a valueCarlos Antonio da Silva2013-11-151-1/+3
| |/
| * Merge pull request #12686 from kryzhovnik/masterCarlos Antonio da Silva2013-11-021-6/+6
| |\
| | * Minor doc fix of ActiveModel::Naming.Andrey Samsonov2013-10-291-6/+6
| * | Merge pull request #12635 from mperham/4-0-stableGuillermo Iguaran2013-10-241-1/+0
| * | Let validates_inclusion_of accept Time and DateTime rangesAkira Matsuda2013-10-231-5/+11
| * | Use bcrypt's public cost attr, not internal constantT.J. Schuck2013-10-101-1/+1
| * | Merge pull request #8791 from griffinmyers/masterRafael Mendonça França2013-10-031-1/+1
| |\ \
| | * | DirtyModel uses a hash to keep track of any changes made to attributesWilliam Myers2013-05-271-1/+1
| * | | bcrypt-ruby v3.1.2 supports Ruby 2.0 on WindowsT.J. Schuck2013-09-231-3/+3
| * | | Fix the documentation method.Rafael Mendonça França2013-09-231-1/+1
| * | | Document reset_changes since it is part of public APIRafael Mendonça França2013-09-231-0/+12
| * | | Merge pull request #10816 from bogdan/less-dirty-dirtyRafael Mendonça França2013-09-231-10/+16
* | | | Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-09-011-1/+3
|\| | |
| * | | Add :nodoc: to ActiveModel::SecurePassword.min_costGaurish Sharma2013-08-291-1/+3
* | | | fixed a typoaditya-kapoor2013-08-201-1/+1
|/ / /
* | | Fix: documentation for ActiveModel::ErrorsRyoji Yoshioka2013-08-051-4/+4
* | | Fix secure_password password_confirmation validationsVladimir Kiselev2013-07-241-2/+8
* | | bcrypt-ruby stable is 3.1Burkhard Vogel-Kreykenbohm2013-07-171-3/+3
* | | it's xml, not jsonJohn Gesimondo2013-07-131-1/+1
* | | eagerly initialize the attributes module to avoid check-then-set race conditionsAaron Patterson2013-07-021-1/+4
* | | remove wrong documentation from a :nodoc:'d methodAaron Patterson2013-07-021-1/+0
* | | the data structure used to store attribute aliases should not be exposedAaron Patterson2013-07-011-0/+10
* | | fix typo in ActiveModel::Error docs [ci skip]Steven Yang2013-06-301-1/+1
* | | remove evals from AM::Validations::CallbacksSteven Yang2013-06-301-1/+3
* | | provide a more sementicthe local variables name for ActiveModel::Validations:...Steven Yang2013-06-291-8/+8
* | | Remove deprecation warning from AttributeMethodsMatcherPaul Nikitochkin2013-06-281-8/+0
* | | Remove deprecated attr_protected/accessibleŁukasz Strzałkowski2013-06-271-21/+0
* | | Merge pull request #11054 from senny/11048_make_default_value_explicitCarlos Antonio da Silva2013-06-271-4/+2
|\ \ \
| * | | make default value for `:message` on `AM::Errors` explicit.Yves Senn2013-06-221-4/+2
* | | | Merge pull request #10774 from chuckbergeron/validates-inclusion-of-accuracy-...Carlos Antonio da Silva2013-06-252-4/+5
|\ \ \ \
| * | | | Use Range#cover? for Numeric ranges (tests via endpoints) and use Range#inclu...Charles Bergeron2013-05-272-4/+5
* | | | | Fixing Issue #11083Akshay Khole2013-06-251-1/+1
* | | | | Revert "Merge pull request #11053 from yangchenyun/mine"José Valim2013-06-221-2/+0
| |/ / / |/| | |
* | | | Merge pull request #11053 from yangchenyun/mineYves Senn2013-06-221-0/+2
|\ \ \ \
| * | | | add explicit AS dependencies for ActiveModel::NamingSteven Yang2013-06-221-0/+2
* | | | | ActiveModel::Model inclusion chain backward compatibilityFred Wu2013-06-201-1/+1
* | | | | Fixes AciveModel::Model with no ancestors, fixes #11004Fred Wu2013-06-191-1/+1