aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* update version to 4.2.0.alphaYves Senn2014-02-231-1/+1
|
* Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-181-1/+1
|\ | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md
| * Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-181-1/+1
| |
* | `#to_param` returns `nil` if `to_key` returns `nil`. Closes #11399.Yves Senn2014-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of `#to_key` (http://api.rubyonrails.org/classes/ActiveModel/Conversion.html#method-i-to_key) states that it returns `nil` if there are no key attributes. `to_param` needs to be aware of that fact and return `nil` as well. Previously it raised the following exception: ``` 1) Error: ConversionTest#test_to_param_returns_nil_if_to_key_is_nil: NoMethodError: undefined method `join' for nil:NilClass /Users/senny/Projects/rails/activemodel/lib/active_model/conversion.rb:65:in `to_param' /Users/senny/Projects/rails/activemodel/test/cases/conversion_test.rb:34:in `block in <class:ConversionTest>' ```
* | Fix doc markup of clear_validators!Carlos Antonio da Silva2014-01-271-2/+2
| |
* | Ability to specify multiple contexts when defining a validation.Vince Puzzella2014-01-271-5/+9
| | | | | | | | | | | | Example: validates_presence_of :name, on: [:update, :custom_validation_context]
* | revises references to :allow_(nil|blank) in some docs [ci skip] [Steven Yang ↵Xavier Noria2014-01-2610-26/+12
| | | | | | | | | | | | & Xavier Noria] Closes #11247.
* | Some minor fixesGodfrey Chan2014-01-241-2/+2
| |
* | Got all the new tests passingGodfrey Chan2014-01-241-10/+8
| |
* | Restored the ability to clear the password with user.password= nil (see the ↵Godfrey Chan2014-01-241-1/+3
| | | | | | | | docs)
* | Fix ActiveModel::Errors#has_key? return valueAdrien Coquio2014-01-221-1/+1
| |
* | Forgot to push this change in the parent commitRafael Mendonça França2014-01-201-1/+1
| |
* | When applying changes or reseting changes create the right classRafael Mendonça França2014-01-201-3/+3
| | | | | | | | | | | | | | Before this patch after the changes are applied the changes can be only accessed using string keys, but before symbols are also accepted. After this change every state of the model will be consistent.
* | Fix eager load of Serializers on Active ModelCarlos Antonio da Silva2014-01-171-2/+2
| |
* | doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip]Yves Senn2014-01-131-1/+2
| |
* | Use a better method name to check the requirement of password confirmationCarlos Antonio da Silva2014-01-071-5/+5
| | | | | | | | | | Also improve changelog entries related to secure password to proper highlight.
* | Fix typo in AMo docs [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
| |
* | Change all "can not"s to the correct "cannot".T.J. Schuck2014-01-031-20/+20
| |
* | update copyright notices to 2014. [ci skip]Vipul A M2014-01-011-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-314-5/+5
|\ \
| * | Fix few typos and improve markup at some levelsRobin Dupret2013-12-244-5/+5
| | |
* | | Merge pull request #13131 from gja/changed-accepts-valuesGodfrey Chan2013-12-301-2/+6
|\ \ \ | | | | | | | | Allows you to check if a field has changed to a particular value
| * | | Allows you to check if an attribute has changed to a particular valueTejas Dinkar2013-12-151-2/+6
| | | | | | | | | | | | | | | | model.name_changed?(from: "Pete", to: "Ringo")
* | | | Merge pull request #13483 from aditya-kapoor/add-missing-slashesYves Senn2013-12-276-6/+6
|\ \ \ \ | | | | | | | | | | Adding missing backslashes in active_model files so as to avoid unwanted [ci skip]
| * | | | Adding missing backslashes in active_model files so as to avoid unwanted ↵aditya-kapoor2013-12-276-6/+6
| | | | | | | | | | | | | | | | | | | | links in rdoc [ci skip]
* | | | | Added Backslashes to ActiveModel::AttributeMethods to prevent unwanted links ↵aditya-kapoor2013-12-251-16/+11
|/ / / / | | | | | | | | | | | | in the rdoc + some other doc fixes.[ci skip]
* | / / Fix few typos in the documentation [ci skip]Robin Dupret2013-12-211-1/+1
| |/ / |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-202-2/+2
|\ \ \ | |_|/ |/| |
| * | 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 branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-09-011-1/+3
| |\ \ \
| * | | | fixed a typoaditya-kapoor2013-08-201-1/+1
| | | | |
* | | | | Get ready to release 4.1.0.beta1David Heinemeier Hansson2013-12-171-1/+1
| |_|_|/ |/| | |
* | | | Fix typo [ci skip]Rafael Mendonça França2013-12-131-1/+1
| | | |
* | | | Added :nodoc: for `attribute_changed?` and `attribute_was` [ci skip]Godfrey Chan2013-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | These methods were made "public" in 47617ecd so that `method_missing` can invoke them without going through `send`, but they aren't meant for consumption from outside of Rails.
* | | | Spelling and Grammar checksAkshay Vishnoi2013-12-121-1/+1
| | | |
* | | | typos rectified lifecycle => life cycleAayush khandelwal2013-12-121-1/+1
| | | |
* | | | Merge pull request #13145 from acapilleri/fix_email_exampleCarlos Antonio da Silva2013-12-031-1/+1
|\ \ \ \ | | | | | | | | | | fix email regex example code [ci skip]
| * | | | fix email regex example code [ci skip]Angelo capilleri2013-12-031-1/+1
| | |_|/ | |/| | | | | | | | | | different from the regex in EmailValidator
* | | | Remove deprecated cattr_* requiresGenadi Samokovarov2013-12-031-1/+1
| | | |
* | | | Typo and grammatical fixes [ci skip]Akshay Vishnoi2013-12-021-1/+1
|/ / /
* | | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-241-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb
| * | | Change syntax format for example returned valuesPrem Sichanugrist2013-11-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: >> r = /some-regexp/ => /some-regexp/ >> r.source.object_id == r.source.object_id => false
* | | | 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
| | | |