Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |||||
* | | | | Use bcrypt's public cost attr, not internal constant | T.J. Schuck | 2013-10-10 | 3 | -1/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: - https://github.com/codahale/bcrypt-ruby/pull/63 - https://github.com/codahale/bcrypt-ruby/pull/64 - https://github.com/codahale/bcrypt-ruby/pull/65 | |||||
* | | | | observers are not part of ActiveModel [ci skip] | Arun Agrawal | 2013-10-09 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | adding load_path to include active_model in the load path of example | Vijay Ubuntu | 2013-10-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | similar to activerecord/examples/simple.rb | |||||
* | | | | Merge pull request #8791 from griffinmyers/master | Rafael Mendonça França | 2013-10-03 | 3 | -2/+22 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated DirtyModel's @changed_attributes hash to be symbol/string agnostic Conflicts: activemodel/CHANGELOG.md | |||||
| * | | | | DirtyModel uses a hash to keep track of any changes made to attributes | William Myers | 2013-05-27 | 3 | -2/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of an instance. When using the attribute_will_change! method, you must supply a string and not a symbol or the *_changed? method will break (because it is looking for the attribute name as a string in the keys of the underlying hash). To remedy this, I simply made the underlying hash a HashWithIndifferentAccess so it won't matter if you supply the attribute name as a symbol or string to attribute_will_change!. | |||||
* | | | | | bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows | T.J. Schuck | 2013-09-23 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | Fix the documentation method. | Rafael Mendonça França | 2013-09-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is reload! in the class definition. [ci skip] | |||||
* | | | | | No need to abbreviate ActiveModel | Rafael Mendonça França | 2013-09-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | Document reset_changes since it is part of public API | Rafael Mendonça França | 2013-09-23 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | Merge pull request #10816 from bogdan/less-dirty-dirty | Rafael Mendonça França | 2013-09-23 | 3 | -12/+23 | |
| | | | | | | | | | | | | | | | | | | | | Make AM::Dirty less dirty to plugin into AR or other library | |||||
* | | | | | use assert_empty in activemodel conditional validation test cases | Rajarshi Das | 2013-09-10 | 1 | -7/+7 | |
| | | | | | ||||||
* | | | | | fix actionview and activemodel test cases typos | Rajarshi Das | 2013-09-05 | 1 | -1/+1 | |
| |_|_|/ |/| | | | ||||||
* | | | | Add :nodoc: to ActiveModel::SecurePassword.min_cost | Gaurish Sharma | 2013-08-29 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | remove unused instance variable | Rajarshi Das | 2013-08-23 | 1 | -2/+1 | |
| | | | | ||||||
* | | | | Dont' check for any order in hash since we aren't sorting it and this is ↵ | Guillermo Iguaran | 2013-08-18 | 1 | -11/+0 | |
| | | | | | | | | | | | | | | | | determinated only by the used interpreter | |||||
* | | | | Refactor serialization test for hash order | Guillermo Iguaran | 2013-08-18 | 1 | -7/+6 | |
| | | | | ||||||
* | | | | Avoid Skip in test, have a unified test for order | Gaurish Sharma | 2013-08-09 | 1 | -10/+7 | |
| | | | | ||||||
* | | | | Add tests for ActiveModel::Serializers::JSON#as_json ordering | Gaurish Sharma | 2013-08-09 | 1 | -1/+10 | |
| |_|/ |/| | | ||||||
* | | | Fix: documentation for ActiveModel::Errors | Ryoji Yoshioka | 2013-08-05 | 1 | -4/+4 | |
| | | | ||||||
* | | | fix tests | Max Shytikov | 2013-07-30 | 1 | -1/+1 | |
| | | | ||||||
* | | | grab executable from rubygems | Arun Agrawal | 2013-07-26 | 1 | -2/+1 | |
| | | | | | | | | | As done here d7fc97d3f90c0e30865d32ce202658f03248cacc | |||||
* | | | Fix secure_password password_confirmation validations | Vladimir Kiselev | 2013-07-24 | 3 | -2/+18 | |
| | | | ||||||
* | | | bcrypt-ruby stable is 3.1 | Burkhard Vogel-Kreykenbohm | 2013-07-17 | 1 | -3/+3 | |
| | | | ||||||
* | | | it's xml, not json | John Gesimondo | 2013-07-13 | 1 | -1/+1 | |
| | | | | | | | | | change docs for xml serializer to talk about xml |