aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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
* | | | Use bcrypt's public cost attr, not internal constantT.J. Schuck2013-10-103-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 Agrawal2013-10-091-1/+1
| | | |
* | | | adding load_path to include active_model in the load path of exampleVijay Ubuntu2013-10-091-0/+1
| | | | | | | | | | | | | | | | similar to activerecord/examples/simple.rb
* | | | Merge pull request #8791 from griffinmyers/masterRafael Mendonça França2013-10-033-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 attributesWilliam Myers2013-05-273-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 WindowsT.J. Schuck2013-09-231-3/+3
| | | | |
* | | | | Fix the documentation method.Rafael Mendonça França2013-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is reload! in the class definition. [ci skip]
* | | | | No need to abbreviate ActiveModelRafael Mendonça França2013-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Document reset_changes since it is part of public APIRafael Mendonça França2013-09-231-0/+12
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #10816 from bogdan/less-dirty-dirtyRafael Mendonça França2013-09-233-12/+23
| | | | | | | | | | | | | | | | | | | | Make AM::Dirty less dirty to plugin into AR or other library
* | | | | use assert_empty in activemodel conditional validation test casesRajarshi Das2013-09-101-7/+7
| | | | |
* | | | | fix actionview and activemodel test cases typosRajarshi Das2013-09-051-1/+1
| |_|_|/ |/| | |
* | | | Add :nodoc: to ActiveModel::SecurePassword.min_costGaurish Sharma2013-08-291-1/+3
| | | | | | | | | | | | | | | | [ci skip]
* | | | remove unused instance variableRajarshi Das2013-08-231-2/+1
| | | |
* | | | Dont' check for any order in hash since we aren't sorting it and this is ↵Guillermo Iguaran2013-08-181-11/+0
| | | | | | | | | | | | | | | | determinated only by the used interpreter
* | | | Refactor serialization test for hash orderGuillermo Iguaran2013-08-181-7/+6
| | | |
* | | | Avoid Skip in test, have a unified test for orderGaurish Sharma2013-08-091-10/+7
| | | |
* | | | Add tests for ActiveModel::Serializers::JSON#as_json orderingGaurish Sharma2013-08-091-1/+10
| |_|/ |/| |
* | | Fix: documentation for ActiveModel::ErrorsRyoji Yoshioka2013-08-051-4/+4
| | |
* | | fix testsMax Shytikov2013-07-301-1/+1
| | |
* | | grab executable from rubygemsArun Agrawal2013-07-261-2/+1
| | | | | | | | | As done here d7fc97d3f90c0e30865d32ce202658f03248cacc
* | | Fix secure_password password_confirmation validationsVladimir Kiselev2013-07-243-2/+18
| | |
* | | bcrypt-ruby stable is 3.1Burkhard Vogel-Kreykenbohm2013-07-171-3/+3
| | |
* | | it's xml, not jsonJohn Gesimondo2013-07-131-1/+1
| | | | | | | | | change docs for xml serializer to talk about xml