Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Enable passing root: false to #to_json | Joe Fiorini | 2011-07-01 | 2 | -6/+69 |
| | |||||
* | Master version is 3.2.0.beta | Santiago Pastorino | 2011-06-30 | 1 | -2/+2 |
| | |||||
* | changing an attribute multiple times retains the correct original value | Ian Stewart | 2011-06-28 | 2 | -1/+10 |
| | |||||
* | Minor formating fix | Alexander Uvarov | 2011-06-24 | 1 | -2/+2 |
| | |||||
* | Follow rails convention by using Array.wrap | Alexander Uvarov | 2011-06-23 | 1 | -2/+3 |
| | |||||
* | Allow to specify mass-assignment roles as array | Alexander Uvarov | 2011-06-23 | 3 | -3/+31 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-18 | 1 | -1/+1 |
|\ | |||||
| * | Remove trailing whitespaces | Guillermo Iguaran | 2011-06-12 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1654 from ganeshkumar/test_cases | Santiago Pastorino | 2011-06-13 | 1 | -1/+0 |
|\ \ | | | | | | | removed duplicate code in tests | ||||
| * | | removed duplicate code | ganesh | 2011-06-11 | 1 | -1/+0 |
| |/ | |||||
* | | Update CHANGELOG. | José Valim | 2011-06-11 | 1 | -0/+3 |
| | | |||||
* | | Get rid of the alternate namespace lookup. | José Valim | 2011-06-11 | 3 | -17/+5 |
|/ | |||||
* | Brought back alternative convention for namespaced models in i18n. | thoefer | 2011-06-08 | 3 | -5/+17 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 4 | -16/+16 |
|\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | ||||
| * | fix incorrect output | Vijay Dev | 2011-06-04 | 1 | -1/+1 |
| | | |||||
| * | 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 |
| | | |||||
* | | Don't add .rb in requires | Guillermo Iguaran | 2011-05-31 | 2 | -2/+2 |
| | | |||||
* | | no need for .rb | Damien Mathieu | 2011-05-31 | 1 | -1/+1 |
| | | |||||
* | | string inflections are needed for running tests in isolation | Damien Mathieu | 2011-05-31 | 1 | -0/+1 |
| | | |||||
* | | Update CHANGELOG. | José Valim | 2011-05-31 | 1 | -0/+2 |
| | | |||||
* | | Transform the symbol into a constant lookup. | José Valim | 2011-05-31 | 3 | -29/+32 |
| | | |||||
* | | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer method | Bogdan Gusiev | 2011-05-30 | 3 | -12/+48 |
| | | | | | | | | | | In order to specify your own sanitize method Implemented .mass_assignment_sanitizer configuration option | ||||
* | | Merge pull request #1334 from bogdan/callback | José Valim | 2011-05-26 | 7 | -39/+57 |
|\ \ | |/ |/| | MassAssignmentSecurity: add ability to specify your own sanitizer | ||||
| * | MassAssignmentSecurity: add ability to specify your own sanitizer | Bogdan Gusiev | 2011-05-26 | 7 | -39/+57 |
| | | | | | | | | | | | | Added an ability to specify your own behavior on mass assingment protection, controlled by option: ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer | ||||
* | | 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 |
| | | |