aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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-303-2/+22
|\ \ \ | | | | | | | | 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-153-2/+22
| | | | | | | | | | | | | | | | 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]
* | | | | Merge pull request #13442 from aditya-kapoor/update-docsGodfrey Chan2013-12-261-16/+11
|\ \ \ \ \ | |/ / / / |/| | | | Updated documentation for Attribute Methods [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]
* | | | | Disable locale checks to avoid warnings in Active Model tests [ci skip]Carlos Antonio da Silva2013-12-231-0/+3
|/ / / / | | | | | | | | | | | | | | | | Missed AMo when adding to the other components in ae196e85ee7169700afac2eecdc276bc06b10b8d.
* | / / 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-1016-71/+159
| |\ \ \
| | * | | Typos. return -> returns. [ci skip]Lauro Caetano2013-12-031-1/+1
| | | | |
| * | | | Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-09-013-9/+4
| |\ \ \ \
| * | | | | fixed a typoaditya-kapoor2013-08-201-1/+1
| | | | | |
* | | | | | Unused classes in AMo testsAkira Matsuda2013-12-191-11/+0
| |_|_|_|/ |/| | | |
* | | | | 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
| | | |
* | | | Merge pull request #13255 from strzalek/bump-builderRafael Mendonça França2013-12-121-1/+1
|\ \ \ \ | | | | | | | | | | Bump up builder
| * | | | More liberal builder dependencyŁukasz Strzałkowski2013-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | Allowing us to get 3.2.x versions if needed.
* | | | | 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
| | | | |
* | | | | Merge pull request #13287 from aayushkhandelwal11/typo_rectifiedYves Senn2013-12-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | typos rectified lifecycle => life cycle
| * | | | | typos rectified lifecycle => life cycleAayush khandelwal2013-12-121-1/+1
| |/ / / /
* | | | | Revert "Merge pull request #13276 from aayushkhandelwal11/change_to_key"Rafael Mendonça França2013-12-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will call primary_key two times This reverts commit d0588a2e897d33c6c12e9fc5f8680328d37a26ca, reversing changes made to 87e1e86640fb8b5a260ff7c0044aaae58fff2bc4.
* | | | | Merge pull request #13276 from aayushkhandelwal11/change_to_keyRafael Mendonça França2013-12-111-2/+1
|\ \ \ \ \ | | | | | | | | | | | | removing multiple check conditions to single check condition
| * | | | | removing multiple check conditions to single check conditionAayush khandelwal2013-12-111-2/+1
| |/ / / /
* | | | | Merge pull request #13273 from robertomiranda/test-remove-requireGuillermo Iguaran2013-12-111-1/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove require 'models/administrator', Administrator is not used in secure password test
| * | | | Remove require 'models/administrator', Administrator is not used in secure ↵robertomiranda2013-12-111-1/+0
| |/ / / | | | | | | | | | | | | password test
* | | | 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
| | | |
* | | | first pass through CHANGELOGS to extract 4_1_release_notes. [ci skip]Yves Senn2013-11-281-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract **notable changes**, **deprecations** and **removals** from each CHANGELOG. I tried to reference the commits and pull requests for new features and deprecations. In the process I also made some minor changes to the CHANGELOGS. The 4_1_release_notes guide is declared WIP.
* | | 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
| | | |
* | | | 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. [ci skip] Conflicts: activemodel/lib/active_model/naming.rb
| * | | Minor doc fix of ActiveModel::Naming.Andrey Samsonov2013-10-291-6/+6
| | | | | | | | | | | | | | | | | | | | - qoute example line's result when it kind of String - right ("singular_route_key") method in example
* | | | Merge pull request #12635 from mperham/4-0-stableGuillermo Iguaran2013-10-241-1/+0
| | | | | | | | | | | | | | | | Allow any version of BCrypt
* | | | Let validates_inclusion_of accept Time and DateTime rangesAkira Matsuda2013-10-233-6/+34
| | | | | | | | | | | | | | | | fixes 4.0.0 regression introduced in 0317b93c17a46d7663a8c36edc26ad0ba3d75f85