Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-11 | 1 | -1/+1 |
|\ | |||||
| * | Update ConfirmationValidator docs, correct when the validator runs | Alan Harper | 2012-01-05 | 1 | -1/+1 |
| | | |||||
* | | removed unnessary require active_support/core_ext/array_wrap | Karunakar (Ruby) | 2012-01-06 | 1 | -1/+0 |
| | | |||||
* | | Revert "Revert "More 1.9 way"" | Santiago Pastorino | 2012-01-06 | 1 | -4/+2 |
| | | | | | | | | | | Fixed failing tests This reverts commit 8350ce97f2065eed9638c595d3938a573d6fa343. | ||||
* | | Remove Array.wrap call in ActiveModel | Rafael Mendonça França | 2012-01-06 | 7 | -17/+12 |
| | | |||||
* | | Revert "More 1.9 way" | Aaron Patterson | 2012-01-05 | 1 | -2/+4 |
| | | | | | | | | This reverts commit 675094b2757cf90399dadca4489b1036810ae570. | ||||
* | | More 1.9 way | Santiago Pastorino | 2012-01-05 | 1 | -4/+2 |
| | | |||||
* | | use logger.warn for warnings | Aaron Patterson | 2012-01-04 | 1 | -1/+1 |
| | | |||||
* | | push exception message formatting to the exception class | Aaron Patterson | 2012-01-04 | 1 | -1/+4 |
| | | |||||
* | | push target down to the classes that care about it | Aaron Patterson | 2012-01-04 | 1 | -4/+5 |
| | | |||||
* | | just implement the delegate method | Aaron Patterson | 2012-01-04 | 1 | -4/+4 |
| | | |||||
* | | Array.wrap no longer needed | Aaron Patterson | 2012-01-04 | 1 | -3/+2 |
|/ | |||||
* | Fix grammatical error in ↵ | Steve Richert | 2012-01-02 | 1 | -1/+1 |
| | | | | ActiveModel::MassAssignmentSecurity::PermissionSet#deny? NotImplementedError message | ||||
* | Merge pull request #4248 from andrew/2012 | Vijay Dev | 2011-12-31 | 1 | -1/+1 |
|\ | | | | | Updated copyright notices for 2012 | ||||
| * | Updated copyright notices for 2012 | Andrew Nesbitt | 2011-12-31 | 1 | -1/+1 |
| | | |||||
* | | Support configuration on ActiveRecord::Model. | Jon Leighton | 2011-12-28 | 6 | -14/+154 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem: We need to be able to specify configuration in a way that can be inherited to models that include ActiveRecord::Model. So it is no longer sufficient to put 'top level' config on ActiveRecord::Base, but we do want configuration specified on ActiveRecord::Base and descendants to continue to work. So we need something like class_attribute that can be defined on a module but that is inherited when ActiveRecord::Model is included. The solution: added ActiveModel::Configuration module which provides a config_attribute macro. It's a bit specific hence I am not putting this in Active Support or making it a 'public API' at present. | ||||
* | | Merge pull request #4172 from nashby/refactor-tokenizer | José Valim | 2011-12-24 | 1 | -4/+2 |
|\ \ | | | | | | | don't call an extra method if options[:tokenizer] is not present | ||||
| * | | don't call an extra method if options[:tokenizer] is not present | Vasiliy Ermolovich | 2011-12-24 | 1 | -4/+2 |
| | | | |||||
* | | | remove deprecated define_attr_method from ActiveModel::AttributeMethods | Sergey Nartimov | 2011-12-24 | 1 | -41/+0 |
|/ / | |||||
* | | use Range#min and Range#max to reduce extra statement | Vasiliy Ermolovich | 2011-12-24 | 1 | -2/+1 |
| | | |||||
* | | deprecate String#encoding_aware? and remove its usage | Sergey Nartimov | 2011-12-24 | 1 | -2/+0 |
| | | |||||
* | | AM::MAS.attr_protected: rework usage example. | Bogdan Gusiev | 2011-12-23 | 1 | -9/+9 |
| | | |||||
* | | Fixed AM::MasAsSec.attr_protected usage example. | Bogdan Gusiev | 2011-12-22 | 1 | -15/+16 |
| | | | | | | | | | | | | | | | | Problems with current example: * DOESN'T WORK ** attr_protected :last_login, :as => :admin # doesn't make it accessible for admin * Uses ActiveSupport Fixnum extension | ||||
* | | Fix AM::MassAssignementSecurity doc | Bogdan Gusiev | 2011-12-22 | 1 | -1/+1 |
| | | |||||
* | | added :other_than => :!= option to numericality validator | Jakub Kuźma | 2011-12-21 | 2 | -2/+4 |
| | | |||||
* | | Remove dead code from AMo. | José Valim | 2011-12-20 | 1 | -12/+0 |
| | | |||||
* | | rails/master is now 4.0.0.beta and will only support Ruby 1.9.3+ | David Heinemeier Hansson | 2011-12-20 | 1 | -3/+3 |
| | | |||||
* | | Party like its R-C-UNO! | David Heinemeier Hansson | 2011-12-19 | 1 | -1/+1 |
| | | |||||
* | | Fixed bug when error message is an empty string. | Antonio Roberto | 2011-12-16 | 1 | -1/+2 |
| | | |||||
* | | Improve cache on route_key lookup. | José Valim | 2011-12-08 | 1 | -2/+23 |
| | | |||||
* | | Ensure length validator also works on 1.8.7. | José Valim | 2011-12-06 | 1 | -6/+17 |
| | | |||||
* | | Merge pull request #3872 from marcandre/i18n_key | José Valim | 2011-12-06 | 1 | -2/+2 |
|\ \ | | | | | | | ActiveModel::Name#i18n_key: Fix doc and add tests | ||||
| * | | ActiveModel::Name#i18n_key: Fix doc and add tests | Marc-Andre Lafortune | 2011-12-05 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #3873 from iangreenleaf/no_default_tokenizer | José Valim | 2011-12-06 | 1 | -2/+1 |
|\ \ \ | |/ / |/| | | Don't tokenize string when counting characters | ||||
| * | | Don't tokenize string when counting characters | Ian Young | 2011-12-04 | 1 | -2/+1 |
| | | | |||||
* | | | Namespaced attribute lookup now works as 'model/association.attribute'. | José Valim | 2011-12-05 | 1 | -6/+14 |
| | | | |||||
* | | | Merge pull request #3859 from kuroda/human_attribute_name | José Valim | 2011-12-05 | 1 | -2/+6 |
|\ \ \ | |/ / |/| | | Fix human_attribute_name to handle names with dots | ||||
| * | | Fix human_attribute_name to handle names with dots | Tsutomu Kuroda | 2011-12-05 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Nested I18n namespace lookup under activerecord.models is deprecated now (c19bd4f). But when a model uses accepts_nested_attributes_for, its Errors object can have an attribute name with "addresses.street" style. In this case, the dots should be substituted with slashes so that we can provide the translation under the "activemodel.attributes.person.addresses/street" key. | ||||
* | | | Fix argument error message for length validation | Alexey Vakhov | 2011-12-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-30 | 2 | -4/+4 |
|\ \ \ | |||||
| * | | | Cosmetic fixes in AM validatations docs | Alexey Vakhov | 2011-11-27 | 2 | -4/+4 |
| | | | | |||||
* | | | | Revert "Implement ArraySerializer and move old serialization API to a new ↵ | José Valim | 2011-11-30 | 8 | -714/+419 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace." This reverts commit 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0. Conflicts: activemodel/lib/active_model.rb activemodel/lib/active_model/serializable.rb activemodel/lib/active_model/serializer.rb activemodel/test/cases/serializer_test.rb | ||||
* | | | | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵ | José Valim | 2011-11-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | a before callback halts. | ||||
* | | | | Deprecated `define_attr_method` in `ActiveModel::AttributeMethods` | Jon Leighton | 2011-11-29 | 1 | -37/+20 |
|/ / / | | | | | | | | | | | | | This only existed to support methods like `set_table_name` in Active Record, which are themselves being deprecated. | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-26 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Small docs fix in Active Model callbacks module | Alexey Vakhov | 2011-11-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Revert the serializers API as other alternatives are now also under discussion | José Valim | 2011-11-25 | 2 | -14/+0 |
| | | | | |||||
* | | | | Merge branch 'serializers' | José Valim | 2011-11-25 | 8 | -419/+728 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides. From José and Yehuda with love. Conflicts: railties/CHANGELOG.md | ||||
| * | | | | Add docs to serializers. Update CHANGELOGs. | José Valim | 2011-11-25 | 1 | -7/+71 |
| | | | | | |||||
| * | | | | Rely solely on active_model_serializer and remove the fancy constant lookup. | José Valim | 2011-11-23 | 2 | -43/+14 |
| | | | | |