Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-12-31 | 4 | -5/+5 | |
|\ \ | ||||||
| * | | Fix few typos and improve markup at some levels | Robin Dupret | 2013-12-24 | 4 | -5/+5 | |
| | | | ||||||
* | | | Merge pull request #13131 from gja/changed-accepts-values | Godfrey Chan | 2013-12-30 | 3 | -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 value | Tejas Dinkar | 2013-12-15 | 3 | -2/+22 | |
| | | | | | | | | | | | | | | | | model.name_changed?(from: "Pete", to: "Ringo") | |||||
* | | | | Merge pull request #13483 from aditya-kapoor/add-missing-slashes | Yves Senn | 2013-12-27 | 6 | -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-kapoor | 2013-12-27 | 6 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | links in rdoc [ci skip] | |||||
* | | | | | Merge pull request #13442 from aditya-kapoor/update-docs | Godfrey Chan | 2013-12-26 | 1 | -16/+11 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Updated documentation for Attribute Methods [ci skip] | |||||
| * | | | | Added Backslashes to ActiveModel::AttributeMethods to prevent unwanted links ↵ | aditya-kapoor | 2013-12-25 | 1 | -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 Silva | 2013-12-23 | 1 | -0/+3 | |
|/ / / / | | | | | | | | | | | | | | | | | Missed AMo when adding to the other components in ae196e85ee7169700afac2eecdc276bc06b10b8d. | |||||
* | / / | Fix few typos in the documentation [ci skip] | Robin Dupret | 2013-12-21 | 1 | -1/+1 | |
| |/ / |/| | | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-12-20 | 2 | -2/+2 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' of github.com:lifo/docrails | aditya-kapoor | 2013-12-10 | 16 | -71/+159 | |
| |\ \ \ | ||||||
| | * | | | Typos. return -> returns. [ci skip] | Lauro Caetano | 2013-12-03 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | aditya-kapoor | 2013-09-01 | 3 | -9/+4 | |
| |\ \ \ \ | ||||||
| * | | | | | fixed a typo | aditya-kapoor | 2013-08-20 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Unused classes in AMo tests | Akira Matsuda | 2013-12-19 | 1 | -11/+0 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Get ready to release 4.1.0.beta1 | David Heinemeier Hansson | 2013-12-17 | 1 | -1/+1 | |
| |_|_|/ |/| | | | ||||||
* | | | | Fix typo [ci skip] | Rafael Mendonça França | 2013-12-13 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #13255 from strzalek/bump-builder | Rafael Mendonça França | 2013-12-12 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Bump up builder | |||||
| * | | | | More liberal builder dependency | Łukasz Strzałkowski | 2013-12-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Allowing us to get 3.2.x versions if needed. | |||||
* | | | | | Added :nodoc: for `attribute_changed?` and `attribute_was` [ci skip] | Godfrey Chan | 2013-12-12 | 1 | -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 checks | Akshay Vishnoi | 2013-12-12 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #13287 from aayushkhandelwal11/typo_rectified | Yves Senn | 2013-12-11 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | typos rectified lifecycle => life cycle | |||||
| * | | | | | typos rectified lifecycle => life cycle | Aayush khandelwal | 2013-12-12 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Revert "Merge pull request #13276 from aayushkhandelwal11/change_to_key" | Rafael Mendonça França | 2013-12-11 | 1 | -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_key | Rafael Mendonça França | 2013-12-11 | 1 | -2/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | removing multiple check conditions to single check condition | |||||
| * | | | | | removing multiple check conditions to single check condition | Aayush khandelwal | 2013-12-11 | 1 | -2/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #13273 from robertomiranda/test-remove-require | Guillermo Iguaran | 2013-12-11 | 1 | -1/+0 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove require 'models/administrator', Administrator is not used in secure password test | |||||
| * | | | | Remove require 'models/administrator', Administrator is not used in secure ↵ | robertomiranda | 2013-12-11 | 1 | -1/+0 | |
| |/ / / | | | | | | | | | | | | | password test | |||||
* | | | | Merge pull request #13145 from acapilleri/fix_email_example | Carlos Antonio da Silva | 2013-12-03 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | fix email regex example code [ci skip] | |||||
| * | | | | fix email regex example code [ci skip] | Angelo capilleri | 2013-12-03 | 1 | -1/+1 | |
| | |_|/ | |/| | | | | | | | | | | different from the regex in EmailValidator | |||||
* | | | | Remove deprecated cattr_* requires | Genadi Samokovarov | 2013-12-03 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Typo and grammatical fixes [ci skip] | Akshay Vishnoi | 2013-12-02 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | first pass through CHANGELOGS to extract 4_1_release_notes. [ci skip] | Yves Senn | 2013-11-28 | 1 | -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 Noria | 2013-11-24 | 1 | -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 values | Prem Sichanugrist | 2013-11-11 | 1 | -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 conditional | Carlos Antonio da Silva | 2013-11-15 | 1 | -4/+7 | |
| | | | | ||||||
* | | | | Invert conditional to avoid double checking for Regexp | Carlos Antonio da Silva | 2013-11-15 | 1 | -11/+12 | |
| | | | | ||||||
* | | | | Only check that the option exists once instead of doing on each conditional | Carlos Antonio da Silva | 2013-11-15 | 1 | -8/+9 | |
| | | | | ||||||
* | | | | Remove argument that is accessible as attribute | Carlos Antonio da Silva | 2013-11-15 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Cache regexp source on format validation to avoid allocating new objects | Carlos Antonio da Silva | 2013-11-15 | 1 | -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 statement | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+6 | |
| | | | | ||||||
* | | | | Avoid a new hash allocation | Carlos Antonio da Silva | 2013-11-15 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Use a simple conditional rather than short circuit with next | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+3 | |
| | | | | ||||||
* | | | | Simplify number parsing logic in numericality validation | Carlos Antonio da Silva | 2013-11-15 | 1 | -10/+3 | |
| | | | | ||||||
* | | | | Avoid creation of extra hash with merge just to set a value | Carlos Antonio da Silva | 2013-11-15 | 1 | -1/+3 | |
|/ / / | ||||||
* | | | Merge pull request #12686 from kryzhovnik/master | Carlos Antonio da Silva | 2013-11-02 | 1 | -6/+6 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Minor doc fix of ActiveModel::Naming. [ci skip] Conflicts: activemodel/lib/active_model/naming.rb | |||||
| * | | | Minor doc fix of ActiveModel::Naming. | Andrey Samsonov | 2013-10-29 | 1 | -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-stable | Guillermo Iguaran | 2013-10-24 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | Allow any version of BCrypt | |||||
* | | | | Let validates_inclusion_of accept Time and DateTime ranges | Akira Matsuda | 2013-10-23 | 3 | -6/+34 | |
| | | | | | | | | | | | | | | | | fixes 4.0.0 regression introduced in 0317b93c17a46d7663a8c36edc26ad0ba3d75f85 |