aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6071 from marcandre/observer_redefJeremy Kemper2012-04-291-1/+1
|\ | | | | Fix Observer by acting on singleton class. Fixes #3505.
| * Fix Observer by acting on singleton class [#3505]Marc-Andre Lafortune2012-04-291-1/+1
| | | | | | | | Also [issue #1034] [pull #6068]
* | Merge pull request #5942 from ↵Aaron Patterson2012-04-292-2/+3
|\ \ | | | | | | | | | | | | bcardarella/confirmation_error_message_on_confirmation_attribute confirmation validation error attribute
| * | Support i18n attributes for confirmationBrian Cardarella2012-04-241-1/+2
| | |
| * | confirmation validation error attributeBrian Cardarella2012-04-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will render the error message on :#{attribute}_confirmation instead of on attribute itself. When rendering confirmation errors inline on the form with form builders such as SimpleForm and Formtastic it is confusing to the ender user to see the confirmation error message on the attribute element. Instead it makes more sense to have this validation error render on the confirmation field instead. The i18n message has been updated for the confirmation validator error message to include the original attribute name.
* | | Generate appropriate error more judiciouslyMarc-Andre Lafortune2012-04-291-2/+3
| | |
* | | Fix error message:Marc-Andre Lafortune2012-04-281-3/+3
| |/ |/| | | | | | | - can pass the class, not the instance - "instance method" is confusing, use "method :instance" instead
* | Refactor human attribute nameCarlos Antonio da Silva2012-04-282-7/+7
| |
* | Do not modify options hash in human_attribute_name, remove reverse_mergeCarlos Antonio da Silva2012-04-281-3/+2
| |
* | Merge pull request #6025 from carlosantoniodasilva/amo-errors-refactorJosé Valim2012-04-281-7/+7
|\ \ | | | | | | Refactor AMo::Errors
| * | Refactor AMo::ErrorsCarlos Antonio da Silva2012-04-271-7/+7
| | | | | | | | | | | | | | | * Use merge!, remove reverse_merge * Use case statement instead of is_a? checks
* | | Return earlier if attribute already changed in *_will_change! methodsCarlos Antonio da Silva2012-04-271-1/+3
|/ / | | | | | | Avoid obtaining the value and duplicating it when possible.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-283-6/+19
|\ \
| * | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+Mark Rushakof2012-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The latter doesn't render as code in HTML output. Regex used in Rubymine to locate the latter form: (\+)(:*\w+:(?::|\w)+)(\+)
| * | minor docs improvementsOscar Del Ben2012-04-262-4/+4
| | |
| * | Add documentation for validate optionsOscar Del Ben2012-04-261-0/+13
| | |
| * | Enhance validations documentationOscar Del Ben2012-04-261-1/+1
| | |
* | | Merge pull request #5878 from oscardelben/refactor_observed_classVijay Dev2012-04-251-5/+2
|\ \ \ | |/ / |/| | Refactor Observer.observed_class
| * | Refactor Observer.observed_classOscar Del Ben2012-04-251-5/+2
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-252-6/+13
|\ \ \
| * | | fix code syntaxOscar Del Ben2012-04-251-2/+2
| | | |
| * | | Add include documentation to serializationOscar Del Ben2012-04-251-1/+6
| | | |
| * | | improve serialization docOscar Del Ben2012-04-251-4/+5
| | | |
| * | | Correct documentation of SecurePasswordOscar Del Ben2012-04-241-1/+2
| | |/ | |/|
* | | Minor refactor of serializable hashOscar Del Ben2012-04-251-2/+1
| |/ |/|
* | Merge pull request #5841 from oscardelben/rename_count_observersJosé Valim2012-04-241-1/+8
|\ \ | | | | | | Rename Observing#count_observers to Observing#observers_count
| * | Rename Observing#count_observers to Observing#observers_countOscar Del Ben2012-04-141-1/+8
| | |
* | | Merge pull request #5966 from oscardelben/fix_secure_password_setterJosé Valim2012-04-241-1/+1
|\ \ \ | | | | | | | | Fix secure_password setter
| * | | Fix secure_password setterOscar Del Ben2012-04-241-1/+1
| | |/ | |/|
* / | Refactor SecurePassword#authenticateOscar Del Ben2012-04-241-5/+1
|/ /
* | Improve observers documentationOscar Del Ben2012-04-181-0/+2
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-183-11/+12
|\ \
| * | Fix confusing example in ActiveModel::ErrorsThibaut Courouble2012-04-171-2/+2
| | |
| * | fix ActiveModel::Validations::Callbacks docJan Xie2012-04-151-1/+2
| | |
| * | fix bad format [ci skip]Michael de Silva2012-04-141-7/+7
| | |
| * | Improve example in initializerOscar Del Ben2012-04-141-1/+1
| |/
* / Rename notify_observers argument *arg to *args to make it more clearOscar Del Ben2012-04-141-2/+2
|/ | | | that the method accepts multiple arguments
* Merge pull request #5736 from oscardelben/configuration_errors_reportingJon Leighton2012-04-111-3/+3
|\ | | | | Add better errors reporting for ActiveModel::Configuration
| * Add better errors reporting for ActiveModel::ConfigurationOscar Del Ben2012-04-041-3/+3
| |
* | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-031-1/+1
|/
* Don't include deprecation in AM::Naming anymoreGrant Hutchins2012-03-311-1/+0
|
* Merge pull request #4904 from ask4prasath/refactor_dirty_module_with_helperJosé Valim2012-03-281-1/+2
|\ | | | | Changing active model dirty module helper method to more appropriate met...
| * Changing active model dirty module helper method to more appropriate method ↵Prasath Venkatraman2012-02-061-1/+2
| | | | | | | | | | | | | | | | with helper #4903 Changing active model dirty module helper method to more appropriate method with helper with Active Support Helper #4903 Changing active model dirty module helper method to more appropriate method with helper with Active Support Helper typo fixed #4903
* | Remove code duplication in InclusionValidator and ExclusionValidator.Rafael Mendonça França2012-03-283-44/+39
| | | | | | | | | | | | | | | | Orginal code by @jamescook Closes #1352 [Rafael Mendonça França + James Cook]
* | Allow ActiveModel::Name to duck typePiotr Sarnacki2012-03-281-4/+4
| |
* | no need to freeze things all the timeAaron Patterson2012-03-261-8/+7
| |
* | ActiveModel::Name does not inherit from stringLukasz Sarnacki2012-03-262-12/+17
| |
* | Merge pull request #5374 from ↵José Valim2012-03-231-4/+1
|\ \ | | | | | | | | | | | | nertzy/remove_deprecated_partial_path_from_active_model_naming Remove ActiveModel::Naming#partial_path
| * | Remove ActiveModel::Naming#partial_pathGrant Hutchins2012-03-101-4/+1
| | | | | | | | | It was deprecated in 3.2
* | | Speed up mass assignment by avoiding extra loops.José Valim2012-03-161-7/+5
| | |