aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #15959 from aditya-kapoor/remove-unneeded-casesRafael Mendonça França2014-07-292-26/+17
|\ \ | | | | | | remove unneeded test model for ActiveModel test cases.
| * | remove unneeded test model for ActiveModel test cases.Aditya Kapoor2014-06-282-26/+17
| | |
* | | Fix example code of `EachValidator` [ci skip]Chun-wei Kuo2014-07-281-1/+1
| | | | | | | | | | | | | | | We have to specify the `:title` option to really use the `TitleValidator` defined above.
* | | Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-191-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: actionpack/test/abstract_unit.rb
| * | | Stop requiring mocha automaticallyRafael Mendonça França2014-07-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are planning to remove mocha from our test suite because of performance problems. To make this possible we should stop require mocha on ActionSupport::TestCase. This should not affect applications since users still need to add mocha to Gemfile and this already load mocha. Added FIXME notes to place that still need mocha removal
* | | | %i doesn't work on 1.9Aaron Patterson2014-07-171-1/+1
| | | |
* | | | Merge pull request #16210 from sonnym/assert_valid_keys_in_validateMatthew Draper2014-07-183-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | Check for valid options in validate method
| * | | | check for valid options in validate methodsonnym2014-07-173-0/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change prevents a certain class of user error which results when mistakenly using the `validate` class method instead of the `validates` class method. Only apply when all arguments are symbols, because some validations use the `validate` method and pass in additional options, namely the `LenghValidator` via the `ActiveMode::Validations::validates_with` method.
* | | | Make restore_attributes publicRafael Mendonça França2014-07-172-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make it accept a list of attributes to be changed. This will make possible to restore only a subset of the changed attributes. Closes #16203
* | | | Deprecate `reset_#{attribute}` in favor of `restore_#{attribute}`.Rafael Mendonça França2014-07-153-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods may cause confusion with the `reset_changes` that behaves differently of them. Also rename undo_changes to restore_changes to match this new set of methods.
* | | | Deprecate ActiveModel::Dirty#reset_changes in favor of ↵Rafael Mendonça França2014-07-153-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #clear_changes_information This method name is causing confusion with the `reset_#{attribute}` methods. While `reset_name` set the value of the name attribute for the previous value the `reset_changes` only discard the changes and previous changes.
* | | | [ci skip] Little bit doc code improvement.Santosh Wadghule2014-07-141-1/+1
|/ / /
* | | Only automatically include validations when enabledGodfrey Chan2014-07-022-12/+5
| | | | | | | | | | | | This is a follow up to #16024.
* | | automatically include ActiveModel::Validations when include ↵Aditya Kapoor2014-07-034-2/+6
| | | | | | | | | | | | ActiveModel::SecurePassword
* | | Silence warning emitted in testsSean Griffin2014-07-011-0/+1
| | | | | | | | | | | | | | | The instance method `model_name` was being defined multiple times, causing a redefinition warning.
* | | Rename rollback_changes to undo_changesRafael Mendonça França2014-06-303-6/+6
| | | | | | | | | | | | To avoid overload with database rollback
* | | Add CHANGELOG entry for #14861 and document private methods on the APIRafael Mendonça França2014-06-302-5/+10
| | |
* | | Merge pull request #14861 from igor04/dirty-rollbackRafael Mendonça França2014-06-302-0/+35
|\ \ \ | |/ / |/| | | | | Added rollback method to ActiveModel::Dirty
| * | Added rollback method to ActiveModel::Dirtyigor042014-06-232-0/+35
| | |
* | | We are talking about the libraries, not the constantsSean Griffin2014-06-271-3/+3
| | |
* | | Note that `_will_change!` is no longer needed for AR instancesSean Griffin2014-06-271-3/+5
| | | | | | | | | | | | | | | | | | | | | Leave the note for `ActiveModel`, since it can't yet detect mutations (hopefully we can change this in time for 4.2). However, we now detect mutations on all supported types in `ActiveRecord`, so we can note that `_will_change!` is no longer needed there.
* | | Merge pull request #15834 from rmehner/allow_proc_and_symbol_for_only_integerRafael Mendonça França2014-06-263-1/+32
|\ \ \ | |_|/ |/| | Allow proc and symbol as values for `only_integer` of `NumericalityValidator`
| * | `only_integer` of `NumericalityValidator` now allows procs and symbolsRobin Mehner2014-06-223-1/+32
| | |
* | | Merge pull request #15871 from yuki24/add-model-name-instance-methodDavid Heinemeier Hansson2014-06-242-0/+12
|\ \ \ | | | | | | | | Add #model_name instance method to ActiveModel::Naming
| * | | Delegate #model_name method to self.classYuki Nishijima2014-06-222-0/+12
| |/ /
* / / remove unnecessary require for json serialization test casesAditya Kapoor2014-06-241-1/+0
|/ /
* | :scissors: and :nail_care: from d60c405 [ci skip]Zachary Scott2014-06-161-3/+3
| |
* | [ci skip] correct doc for serialization in accordance with API Doc GuideAditya Kapoor2014-06-161-11/+11
| |
* | Correct typo, add test for validates_absence_of, correct method namesAkshay Vishnoi2014-06-161-3/+4
| |
* | Edit pass on `has_secure_password` documentation [ci skip]Godfrey Chan2014-06-141-5/+6
| |
* | [ci skip] Update #has_secure_password docsAkshay Vishnoi2014-06-141-6/+9
| |
* | Use `@existing_user` while updating existing user, fixing - #ee4e86Akshay Vishnoi2014-06-141-6/+6
| |
* | Cleaned up the `has_secure_password` test casesGodfrey Chan2014-06-141-33/+29
| | | | | | | | | | | | * Grouped the valid test cases in one place * Make the length of the generated password obvious * Removed two wrong (copy-and-pasted) test cases
* | Added changelog for #15708 [ci skip]Godfrey Chan2014-06-141-0/+7
| |
* | SecurePassword - Validate password must be less than or equal to 72Akshay Vishnoi2014-06-142-0/+34
| | | | | | | | See #14591, Reason - BCrypt hash function can handle maximum 72 characters.
* | Merge pull request #15690 from deeeki/activemodel_model_docArthur Nogueira Neves2014-06-131-3/+3
|\ \ | | | | | | [ci skip] Clarify ActiveModel::Model docs
| * | [ci skip] Clarify ActiveModel::Model docsdeeeki2014-06-141-3/+3
| | | | | | | | | | | | ActiveModel attributes initialized with String return String values
* | | [ci skip] correct docs for conversionAditya Kapoor2014-06-111-5/+12
|/ /
* | [ci skip] add tests for ActionModel::ConversionAditya Kapoor2014-06-111-0/+4
| |
* | fix typo in changelog [ci skip]Vijay Dev2014-06-111-1/+1
| |
* | Merge pull request #15635 from kuldeepaggarwal/add-missing-changelogYves Senn2014-06-111-0/+6
|\ \ | | | | | | | | | add missing changelog entry. refer [#16db90d] [ci skip]
| * | add missing changelog entry. refer [#16db90d] [ci skip]Kuldeep Aggarwal2014-06-111-0/+4
|/ /
* | remove depricated Validatior#setupKuldeep Aggarwal2014-06-102-37/+0
| |
* | Feature requests should be made on the mailing list, not submitted toZachary Scott2014-06-011-1/+6
| | | | | | | | the issue tracker. See also #15455 [ci skip]
* | [ci skip] Include ActiveModel::Model in a class instead of inheritingAkshay Vishnoi2014-05-301-2/+3
| |
* | Name#model_name doesn't return a String objectShunsukeAida2014-05-302-2/+2
| |
* | Merge pull request #15154 from msgehard/move_password_fieldRafael Mendonça França2014-05-201-2/+2
|\ \ | | | | | | Put attr_reader in with all of the other instance methods
| * | Put attr_reader in with all of the other instance methodsMike Gehard2014-05-171-2/+2
| | | | | | | | | | | | This makes the grouping make a little more sense
* | | Let others know why this code is hereMike Gehard2014-05-181-0/+1
|/ / | | | | | | [ci skip]
* | formatting pass through CHANGELOGS. [ci skip]Yves Senn2014-05-161-1/+1
| |