Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use clearer variable name in examples | Vijay Dev | 2011-06-04 | 2 | -12/+12 |
| | |||||
* | remove stray ( | Vijay Dev | 2011-06-03 | 1 | -1/+1 |
| | |||||
* | Change hashrocket spacing to match conventions. | Ben Orenstein | 2011-06-02 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 13 | -24/+24 |
|\ | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | ||||
| * | Remove extra white spaces on ActiveModel docs. | Sebastian Martinez | 2011-05-23 | 13 | -24/+24 |
| | | |||||
* | | fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 | Vijay Dev | 2011-05-24 | 1 | -2/+2 |
| | | |||||
* | | Merge branch '3-1-stable' | Joshua Peek | 2011-05-22 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec | ||||
| * | | Fix I18n dependency as final is out. | José Valim | 2011-05-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1192 from arunagw/removal_extra | José Valim | 2011-05-22 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | No more need rubygems here. | ||||
| * | | | No more need rubygems here. | Arun Agrawal | 2011-05-22 | 1 | -1/+0 |
| | | | | |||||
* | | | | Move I18n dependency back to ActiveSupport. | José Valim | 2011-05-22 | 1 | -1/+0 |
| |/ / |/| | | |||||
* | | | Remove superfluous whitespace from ActiveModel::SecurePassword | Daniel Schierbeck | 2011-05-22 | 1 | -1/+1 |
| | | | | | | | | | Only one space is needed, yo! | ||||
* | | | Bump versions for rc1 | David Heinemeier Hansson | 2011-05-21 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1180 from Karunakar/documentation_change | Xavier Noria | 2011-05-21 | 1 | -1/+1 |
|\ \ | | | | | | | Documentation Error Fixed for ticket #839 | ||||
| * | | ActionMailer deliver method Documentation corrected Ticket #761 | Ganesh Kumar | 2011-05-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1165 from arunagw/rubyforge_remove | José Valim | 2011-05-21 | 1 | -1/+0 |
|\ \ \ | |/ / |/| | | Not updating rubyforge for new versions. | ||||
| * | | Not updating rubyforge for new versions. Result of "gem list -d rails" is ↵ | Arun Agrawal | 2011-05-20 | 1 | -1/+0 |
| | | | | | | | | | | | | not useful. | ||||
* | | | Specify the name to be used for ActiveModel::Name fixes #1168 | Yves Senn | 2011-05-20 | 2 | -3/+41 |
|/ / | | | | | | | This patch allows to specify the name of your models independent of the class name. | ||||
* / | Prefer each instead of for in | Guillermo Iguaran | 2011-05-19 | 1 | -3/+1 |
|/ | |||||
* | Attributes with :string type should not be given the type passed in model ↵ | Jim Herzberg | 2011-05-18 | 2 | -2/+8 |
| | | | | serialization options. Closes #1058 | ||||
* | Remove unneeded merge with default false options | Akira Matsuda | 2011-05-16 | 1 | -4/+0 |
| | |||||
* | Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use ↵ | Akira Matsuda | 2011-05-16 | 1 | -2/+2 |
| | | | | it only when needed. | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 1 | -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::Conversion | Sebastian Martinez | 2011-05-04 | 1 | -4/+4 |
| | | |||||
* | | Follow code conventions on some tests | Sebastian Martinez | 2011-05-10 | 4 | -29/+29 |
| | | |||||
* | | Merge pull request #493 from guilleiguaran/changelog-fixes | Aaron Patterson | 2011-05-10 | 1 | -1/+30 |
|\ \ | | | | | | | Merging 3.0.x CHANGELOGs | ||||
| * | | Merging 3.0.x CHANGELOGs | Guillermo Iguaran | 2011-05-10 | 1 | -1/+30 |
| | | | |||||
* | | | Methods that return nil should not be considered YAML | Joshua Wehner | 2011-05-10 | 3 | -0/+9 |
|/ / | |||||
* | | renamed mass-assignment scopes to roles, updated code, tests, docs and ↵ | Josh Kalderimis | 2011-05-08 | 2 | -25/+25 |
| | | | | | | | | security guide | ||||
* | | Add documentation for new observer enable/disable feature. | Myron Marston | 2011-05-06 | 3 | -3/+53 |
| | | |||||
* | | Update CHANGELOGs. | José Valim | 2011-05-06 | 1 | -0/+2 |
| | | |||||
* | | Prepare for beta1 | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+1 |
|/ | |||||
* | Improved ActiveModel Observing docs. | Sebastian Martinez | 2011-04-30 | 1 | -2/+4 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Dan Pickett | 2011-04-29 | 3 | -4/+4 |
|\ | |||||
| * | Rephrased Dirty#changed? docs | Sebastian Martinez | 2011-04-26 | 1 | -1/+1 |
| | | |||||
| * | Removed extra whitespace | Sebastian Martinez | 2011-04-26 | 1 | -1/+1 |
| | | |||||
| * | Better formatting on ActiveModel::Translation | Sebastian Martinez | 2011-04-26 | 1 | -2/+2 |
| | | |||||
* | | fix typo | Aditya Sanghi | 2011-04-29 | 1 | -1/+1 |
| | | |||||
* | | :if should not fire on validations when not in context with :on | Aditya Sanghi | 2011-04-29 | 3 | -3/+17 |
| | | |||||
* | | Add additional tests for AM::ObserverArray that I had missed yesterday. | Myron Marston | 2011-04-28 | 1 | -1/+50 |
| | | |||||
* | | Fix bug with AM::Observer disablement. | Myron Marston | 2011-04-28 | 3 | -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 Marston | 2011-04-28 | 2 | -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 Marston | 2011-04-28 | 3 | -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é Valim | 2011-04-28 | 3 | -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 Marston | 2011-04-28 | 3 | -3/+75 |
| | | | | | | | | Last call wins. | ||||
* | | Allow observers to be enabled and disabled. | Myron Marston | 2011-04-28 | 5 | -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 Marston | 2011-04-28 | 1 | -1/+5 |
| | | |||||
* | | bump the i18n gem to 0.6.0beta1 and update docs for the i18n exception ↵ | Sven Fuchs | 2011-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | handler [#6739 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | minor correction to the AMo mass-assignment security docs | Josh Kalderimis | 2011-04-24 | 1 | -1/+1 |
| | | |||||
* | | AM mass assignment security attr_accessible and attr_protected now allow for ↵ | Josh Kalderimis | 2011-04-24 | 4 | -45/+135 |
|/ | | | | | | | | scopes using :as => scope eg. attr_accessible :name attr_accessible :name, :admin, :as => :admin |