aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3-1-stable'Joshua Peek2011-05-221-0/+1
|\ | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec
| * Fix I18n dependency as final is out.José Valim2011-05-221-1/+1
| |
* | Merge pull request #1192 from arunagw/removal_extraJosé Valim2011-05-221-1/+0
|\ \ | | | | | | No more need rubygems here.
| * | No more need rubygems here.Arun Agrawal2011-05-221-1/+0
| | |
* | | Move I18n dependency back to ActiveSupport.José Valim2011-05-221-1/+0
| |/ |/|
* | Remove superfluous whitespace from ActiveModel::SecurePassword Daniel Schierbeck2011-05-221-1/+1
| | | | | | Only one space is needed, yo!
* | Bump versions for rc1David Heinemeier Hansson2011-05-211-1/+1
|/
* Merge pull request #1180 from Karunakar/documentation_changeXavier Noria2011-05-211-1/+1
|\ | | | | Documentation Error Fixed for ticket #839
| * ActionMailer deliver method Documentation corrected Ticket #761Ganesh Kumar2011-05-211-1/+1
| |
* | Merge pull request #1165 from arunagw/rubyforge_removeJosé Valim2011-05-211-1/+0
|\ \ | |/ |/| Not updating rubyforge for new versions.
| * Not updating rubyforge for new versions. Result of "gem list -d rails" is ↵Arun Agrawal2011-05-201-1/+0
| | | | | | | | not useful.
* | Specify the name to be used for ActiveModel::Name fixes #1168Yves Senn2011-05-202-3/+41
|/ | | | This patch allows to specify the name of your models independent of the class name.
* Prefer each instead of for inGuillermo Iguaran2011-05-191-3/+1
|
* Attributes with :string type should not be given the type passed in model ↵Jim Herzberg2011-05-182-2/+8
| | | | serialization options. Closes #1058
* Remove unneeded merge with default false optionsAkira Matsuda2011-05-161-4/+0
|
* Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use ↵Akira Matsuda2011-05-161-2/+2
| | | | it only when needed.
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-141-4/+4
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
| * Improve doc styles for ActiveModel::ConversionSebastian Martinez2011-05-041-4/+4
| |
* | Follow code conventions on some testsSebastian Martinez2011-05-104-29/+29
| |
* | Merge pull request #493 from guilleiguaran/changelog-fixesAaron Patterson2011-05-101-1/+30
|\ \ | | | | | | Merging 3.0.x CHANGELOGs
| * | Merging 3.0.x CHANGELOGsGuillermo Iguaran2011-05-101-1/+30
| | |
* | | Methods that return nil should not be considered YAMLJoshua Wehner2011-05-103-0/+9
|/ /
* | renamed mass-assignment scopes to roles, updated code, tests, docs and ↵Josh Kalderimis2011-05-082-25/+25
| | | | | | | | security guide
* | Add documentation for new observer enable/disable feature.Myron Marston2011-05-063-3/+53
| |
* | Update CHANGELOGs.José Valim2011-05-061-0/+2
| |
* | Prepare for beta1David Heinemeier Hansson2011-05-041-1/+1
|/
* Improved ActiveModel Observing docs.Sebastian Martinez2011-04-301-2/+4
|
* Merge branch 'master' of github.com:lifo/docrailsDan Pickett2011-04-293-4/+4
|\
| * Rephrased Dirty#changed? docsSebastian Martinez2011-04-261-1/+1
| |
| * Removed extra whitespaceSebastian Martinez2011-04-261-1/+1
| |
| * Better formatting on ActiveModel::TranslationSebastian Martinez2011-04-261-2/+2
| |
* | fix typoAditya Sanghi2011-04-291-1/+1
| |
* | :if should not fire on validations when not in context with :onAditya Sanghi2011-04-293-3/+17
| |
* | Add additional tests for AM::ObserverArray that I had missed yesterday.Myron Marston2011-04-281-1/+50
| |
* | Fix bug with AM::Observer disablement.Myron Marston2011-04-283-25/+27
| | | | | | | | | | Now that we propagate the enabling/disabling to descendants, we no longer have to check the disabled_observer Set on each superclass of the model class. This was causing a bug when disabling all observers at a superclass level and then enabling an individual observer at a subclass level. Plus the logic is simpler now :).
* | Fix dev env memory leaks by using AS::DescendantsTracker rather than keeping ↵Myron Marston2011-04-282-36/+12
| | | | | | | | | | track of subclasses manually. There's also no need to keep track of all ObserverArray instances in a hash, as this is likely to leak memory, too.
* | Revert "Revert "Handle enabling/disabling observers at different levels of ↵Myron Marston2011-04-283-3/+75
| | | | | | | | | | | | | | | | | | the class hierarchy."" This reverts commit 2a25c5818b03d7d6cd63aad180bff23479dbd861. I'm going to add another commit that keeps the same behavior of fixes the problems of leaking memory in development.
* | Revert "Handle enabling/disabling observers at different levels of the class ↵José Valim2011-04-283-75/+3
| | | | | | | | | | | | | | | | | | | | hierarchy." This reverts commit ad62f1928768bd2676958a4a08512bad342fe469 because the current subclasses implementation leaks memory in development. Instead of keeping an array of subclasses, the better solution is to ask the parent if an observer is being disabled or not.
* | Handle enabling/disabling observers at different levels of the class hierarchy.Myron Marston2011-04-283-3/+75
| | | | | | | | Last call wins.
* | Allow observers to be enabled and disabled.Myron Marston2011-04-285-3/+276
| | | | | | | | This is useful in situations like model unit tests and the occasional rake task to backfill old data.
* | Wrap line that is over 200 characters long. Now it's much easier to read.Myron Marston2011-04-281-1/+5
| |
* | bump the i18n gem to 0.6.0beta1 and update docs for the i18n exception ↵Sven Fuchs2011-04-261-1/+1
| | | | | | | | | | | | handler [#6739 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* | minor correction to the AMo mass-assignment security docsJosh Kalderimis2011-04-241-1/+1
| |
* | AM mass assignment security attr_accessible and attr_protected now allow for ↵Josh Kalderimis2011-04-244-45/+135
|/ | | | | | | | scopes using :as => scope eg. attr_accessible :name attr_accessible :name, :admin, :as => :admin
* minor correction to the Active Model instantiate_observers docJosh Kalderimis2011-04-221-1/+1
|
* let this regexp be stricterXavier Noria2011-04-191-1/+1
| | | | | | | | | The purpose of this regexp is to detect strings that are valid identifiers to be used as method names. The anchor $ allows a trailing newline, and both ^ and $ may be bypassed because Ruby regexps are multiline always. The anchors \A and \z are the proper ones to ensure string boundaries.
* Let's not dup because value may not always be duplicable.José Valim2011-04-191-1/+1
|
* Avoid define_method if possible.José Valim2011-04-191-12/+39
|
* bcrypt will encrypt anything, so validate_presence_of would not catch nil / ↵Aaron Patterson2011-04-142-1/+15
| | | | blank passwords. Thank you to Aleksander Kamil Modzelewski for reporting this
* Declaring the attr_accessor for password_confirmation is not necessaryBrian Cardarella2011-04-141-2/+1
| | | | as the confirmation validation already adds that attr_accessor