Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2014-08-29 | 3 | -11/+9 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #16661 from edogawaconan/doc-fix | Yves Senn | 2014-08-27 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Update documentation to match change in #5942 [ci skip] | |||||
| | * | | | Update documentation to match change in #5942 [ci skip] | edogawaconan | 2014-08-24 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Use ActiveSupport::Concern instead of the traditinal way | Yukio Mizuta | 2014-08-25 | 1 | -7/+7 | |
| |/ / / | ||||||
| * | | | Using `each_with_object` instead of `reduce` | Attila Domokos | 2014-08-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | This way no new object allocation is taking place. Thanks @jeremy for the suggestion! | |||||
| * | | | Replacing an each with reduce | Attila Domokos | 2014-08-21 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functionality has not changed, but the code is more elegant by using `reduce` instead of `each`. This way no accumulator needs to be declared, no explicit return is needed. | |||||
* | | | | Preparing for 4.2.0.beta1 release | David Heinemeier Hansson | 2014-08-19 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Check attributes passed to create_with and where | Rafael Mendonça França | 2014-08-18 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the request parameters are passed to create_with and where they can be used to do mass assignment when used in combination with Relation#create. Fixes CVE-2014-3514 Conflicts: activerecord/lib/active_record/relation/query_methods.rb | |||||
* | | | No need to check model_name anymore | Rafael Mendonça França | 2014-08-17 | 1 | -4/+2 | |
| | | | ||||||
* | | | Merge pull request #15889 from carnesmedia/model-name | Rafael Mendonça França | 2014-08-17 | 6 | -8/+12 | |
|\ \ \ | | | | | | | | | | | | | Use #model_name on instances instead of classes | |||||
| * | | | Use #model_name on instances instead of classes | Amiel Martin | 2014-06-24 | 6 | -8/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This allows rails code to be more confdent when asking for a model name, instead of having to ask for the class. Rails core discussion here: https://groups.google.com/forum/#!topic/rubyonrails-core/ThSaXw9y1F8 | |||||
* | | | | Don't expose these new APIs yet (added in 877ea78 / #16189) | Godfrey Chan | 2014-08-16 | 1 | -14/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | WARNING: don't use them! They might change or go away between future beta/RC/ patch releases! Also added a CHANGELOG entry for this. | |||||
* | | | | Implement `_was` and `changes` for in-place mutations of AR attributes | Sean Griffin | 2014-08-16 | 1 | -3/+16 | |
| | | | | ||||||
* | | | | Allow password to contain spaces only. | Yevhene Shemet | 2014-08-06 | 1 | -2/+2 | |
| |/ / |/| | | ||||||
* | | | Call public methods rather than class_eval'ing | Carlos Antonio da Silva | 2014-08-05 | 1 | -4/+2 | |
| |/ |/| | ||||||
* | | Fix example code of `EachValidator` [ci skip] | Chun-wei Kuo | 2014-07-28 | 1 | -1/+1 | |
| | | | | | | | | | | We have to specify the `:title` option to really use the `TitleValidator` defined above. | |||||
* | | %i doesn't work on 1.9 | Aaron Patterson | 2014-07-17 | 1 | -1/+1 | |
| | | ||||||
* | | check for valid options in validate method | sonnym | 2014-07-17 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | 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 public | Rafael Mendonça França | 2014-07-17 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | 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ça | 2014-07-15 | 1 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | 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ça | 2014-07-15 | 1 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | #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 Wadghule | 2014-07-14 | 1 | -1/+1 | |
| | | ||||||
* | | Only automatically include validations when enabled | Godfrey Chan | 2014-07-02 | 1 | -1/+2 | |
| | | | | | | | | This is a follow up to #16024. | |||||
* | | automatically include ActiveModel::Validations when include ↵ | Aditya Kapoor | 2014-07-03 | 1 | -0/+1 | |
| | | | | | | | | ActiveModel::SecurePassword | |||||
* | | Silence warning emitted in tests | Sean Griffin | 2014-07-01 | 1 | -0/+1 | |
| | | | | | | | | | | The instance method `model_name` was being defined multiple times, causing a redefinition warning. | |||||
* | | Rename rollback_changes to undo_changes | Rafael Mendonça França | 2014-06-30 | 1 | -3/+3 | |
| | | | | | | | | To avoid overload with database rollback | |||||
* | | Add CHANGELOG entry for #14861 and document private methods on the API | Rafael Mendonça França | 2014-06-30 | 1 | -5/+5 | |
| | | ||||||
* | | Merge pull request #14861 from igor04/dirty-rollback | Rafael Mendonça França | 2014-06-30 | 1 | -0/+17 | |
|\ \ | | | | | | | | | | Added rollback method to ActiveModel::Dirty | |||||
| * | | Added rollback method to ActiveModel::Dirty | igor04 | 2014-06-23 | 1 | -0/+17 | |
| | | | ||||||
* | | | We are talking about the libraries, not the constants | Sean Griffin | 2014-06-27 | 1 | -3/+3 | |
| | | | ||||||
* | | | Note that `_will_change!` is no longer needed for AR instances | Sean Griffin | 2014-06-27 | 1 | -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_integer | Rafael Mendonça França | 2014-06-26 | 1 | -1/+13 | |
|\ \ \ | |_|/ |/| | | Allow proc and symbol as values for `only_integer` of `NumericalityValidator` | |||||
| * | | `only_integer` of `NumericalityValidator` now allows procs and symbols | Robin Mehner | 2014-06-22 | 1 | -1/+13 | |
| | | | ||||||
* | | | Delegate #model_name method to self.class | Yuki Nishijima | 2014-06-22 | 1 | -0/+6 | |
|/ / | ||||||
* | | :scissors: and :nail_care: from d60c405 [ci skip] | Zachary Scott | 2014-06-16 | 1 | -3/+3 | |
| | | ||||||
* | | [ci skip] correct doc for serialization in accordance with API Doc Guide | Aditya Kapoor | 2014-06-16 | 1 | -11/+11 | |
| | | ||||||
* | | Edit pass on `has_secure_password` documentation [ci skip] | Godfrey Chan | 2014-06-14 | 1 | -5/+6 | |
| | | ||||||
* | | [ci skip] Update #has_secure_password docs | Akshay Vishnoi | 2014-06-14 | 1 | -6/+9 | |
| | | ||||||
* | | SecurePassword - Validate password must be less than or equal to 72 | Akshay Vishnoi | 2014-06-14 | 1 | -0/+6 | |
| | | | | | | | | See #14591, Reason - BCrypt hash function can handle maximum 72 characters. | |||||
* | | Merge pull request #15690 from deeeki/activemodel_model_doc | Arthur Nogueira Neves | 2014-06-13 | 1 | -3/+3 | |
|\ \ | | | | | | | [ci skip] Clarify ActiveModel::Model docs | |||||
| * | | [ci skip] Clarify ActiveModel::Model docs | deeeki | 2014-06-14 | 1 | -3/+3 | |
| | | | | | | | | | | | | ActiveModel attributes initialized with String return String values | |||||
* | | | [ci skip] correct docs for conversion | Aditya Kapoor | 2014-06-11 | 1 | -5/+12 | |
|/ / | ||||||
* | | remove depricated Validatior#setup | Kuldeep Aggarwal | 2014-06-10 | 1 | -16/+0 | |
| | | ||||||
* | | [ci skip] Include ActiveModel::Model in a class instead of inheriting | Akshay Vishnoi | 2014-05-30 | 1 | -2/+3 | |
| | | ||||||
* | | Name#model_name doesn't return a String object | ShunsukeAida | 2014-05-30 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #15154 from msgehard/move_password_field | Rafael Mendonça França | 2014-05-20 | 1 | -2/+2 | |
|\ \ | | | | | | | Put attr_reader in with all of the other instance methods | |||||
| * | | Put attr_reader in with all of the other instance methods | Mike Gehard | 2014-05-17 | 1 | -2/+2 | |
| | | | | | | | | | | | | This makes the grouping make a little more sense | |||||
* | | | Let others know why this code is here | Mike Gehard | 2014-05-18 | 1 | -0/+1 | |
|/ / | | | | | | | [ci skip] | |||||
* / | Add singular and plural form for some validation messages | Abd ar-Rahman Hamidi | 2014-05-02 | 1 | -3/+9 | |
|/ | ||||||
* | add missing parentheses to validates_with documentation [skip ci] | Steve Agalloco | 2014-04-04 | 1 | -1/+1 | |
| |