aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
Commit message (Collapse)AuthorAgeFilesLines
* Remove blank trailing commentsHenrik Hodne2012-05-2011-16/+0
| | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
* Merge pull request #5678 from troyk/patch-1Carlos Antonio da Silva2012-05-191-1/+1
|\ | | | | Remove sort on attributes.keys
| * Remove sort on attributes.keysTroy Kruthoff2012-03-301-1/+1
| |
* | Merge pull request #6215 from erichmenge/fix_has_secure_passwordAaron Patterson2012-05-171-5/+10
|\ \ | | | | | | Fix has secure password
| * | has_secure_password shouldn't validate password_digest. It should also take ↵Erich Menge2012-05-081-5/+10
| | | | | | | | | | | | options to turn validations off.
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-179-101/+154
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb
| * | | fixing removed empty lines and examplesFrancesco Rodriguez2012-05-168-6/+11
| | | |
| * | | fixing validates_with docsFrancesco Rodriguez2012-05-161-6/+4
| | | |
| * | | better format and fixes to validators docsFrancesco Rodriguez2012-05-168-104/+154
| | | |
| * | | better example format in validates_exclusion_of docsFrancesco Rodriguez2012-05-161-2/+2
| | | |
* | | | Improve logging of ActiveModel::MassAssignmentSecurity::SanitizerNaoto Takai2012-05-172-10/+23
| | | |
* | | | Kill whitespaces :scissors:Carlos Antonio da Silva2012-05-151-2/+2
| | | |
* | | | Merge pull request #6284 from acapilleri/dup_validationCarlos Antonio da Silva2012-05-151-0/+6
|\ \ \ \ | |/ / / |/| | | clean the erros if an object that includes validation is duped.
| * | | clean the erros if an object that includes validations errors is duped. ↵Angelo Capilleri2012-05-131-0/+6
| | | | | | | | | | | | | | | | Fixes #5953
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * | | | Missed colonAlexey Vakhov2012-05-141-1/+1
| |/ / /
* | | | updating define_attribute_methods documentationFrancesco Rodriguez2012-05-141-1/+1
| | | |
* | | | allow define_attribute_methods to pass multiple valuesFrancesco Rodriguez2012-05-141-7/+7
| | | |
* | | | Merge pull request #5729 from oscardelben/use_tapJosé Valim2012-05-131-5/+1
|\ \ \ \ | |/ / / |/| | | Use the more idiomatic tap method
| * | | Use the more idiomatic tap methodOscar Del Ben2012-04-041-5/+1
| | | |
* | | | Use respond_to?(:to_ary) rather than is_a?(Enumerable) to detect ↵Jon Leighton2012-05-112-3/+5
| |/ / |/| | | | | | | | collection-thing.
* | | simplify the alias_attribute example [ci skip]Vijay Dev2012-05-081-20/+1
| | |
* | | added docs to alias_attribute methodFrancesco Rodriguez2012-05-071-0/+31
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-011-0/+1
|\ \ \
| * | | Add line which gives a little bit more information how *_will_change! works.Edward Tsech2012-05-011-0/+1
| | | |
* | | | notify_observers should be publicMarc-Andre Lafortune2012-04-301-19/+18
| | | |
* | | | Merge pull request #6063 from marcandre/observer_extra_argsAaron Patterson2012-04-301-9/+17
|\ \ \ \ | | | | | | | | | | Allow extra arguments for Observers
| * | | | Allow extra arguments for ObserversMarc-Andre Lafortune2012-04-301-9/+17
| | | | |
* | | | | 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
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 19:22:02 +0000