Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Fix warning. assigned but unused variable - path_params | kennyj | 2012-01-28 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #4721 from ab9/fix_has_secure_password_doc | José Valim | 2012-01-27 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Fix documentation for has_secure_password | |||||
| * | | | fix example code in documentation for has_secure_password | Aaron Beckerman | 2012-01-28 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #4715 from pwim/find-create-multi-args | Jon Leighton | 2012-01-27 | 2 | -1/+12 | |
|\ \ \ | | | | | | | | | Fix regression from Rails 3.1 | |||||
| * | | | Fix regression from Rails 3.1 | Paul McMahon | 2012-01-27 | 2 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Under Rails 3.1, you were allowed to pass a hash to a find_or_create method with multiple attribute names, but this was broken as the arguments were being improperly validated. | |||||
* | | | | Disagree with @spastorino, @jonleighton, @tenderlove on ↵ | Jeremy Kemper | 2012-01-26 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51ccb7f59c83120bf6869f1febfebaec44bcface Same-level method visibility disappears into the syntax. Indent (and outdent) emphasize the state change that accompanies the declaration. All methods following 'private' are private: that's a natural hierarchy worthy of visual reinforcement. Outdent, represent! :trollface: | |||||
* | | | Merge pull request #4713 from carlosantoniodasilva/form-label-for | Piotr Sarnacki | 2012-01-26 | 3 | -1/+7 | |
|\ \ \ | | | | | | | | | Do not generate label for attribute when giving nil | |||||
| * | | | Do not generate label for attribute when giving nil | Carlos Antonio da Silva | 2012-01-26 | 3 | -1/+7 | |
|/ / / | ||||||
* | | | Revert usage of safe constantize | José Valim | 2012-01-26 | 1 | -1/+3 | |
| | | | ||||||
* | | | Merge pull request #4711 from atambo/master | José Valim | 2012-01-26 | 2 | -3/+4 | |
|\ \ \ | |/ / |/| | | 3.2 safe_constantize should handle wrong constant name NameErrors Fixes #4710 | |||||
| * | | safe_constantize should handle wrong constant name NameErrors Fixes #4710 | Alex Tambellini | 2012-01-26 | 2 | -3/+4 | |
|/ / | ||||||
* | | bumping journey to 1.0.1 | Aaron Patterson | 2012-01-26 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #4696 from rafaelfranca/issue-4653 | Aaron Patterson | 2012-01-26 | 1 | -2/+0 | |
| | | | | | | | | Remove extra attributes from HABTM join tables in AR tests | |||||
* | | global variables may not be set depending on the match. fixes #4703 | Aaron Patterson | 2012-01-26 | 2 | -1/+8 | |
| | | ||||||
* | | Merge pull request #4699 from mattdbridges/typo_fix | Vijay Dev | 2012-01-26 | 1 | -1/+1 | |
|\ \ | | | | | | | Fixed small typo in ActveRecord/CHANGELOG.md | |||||
| * | | Fixed small typo in ActveRecord/CHANGELOG.md | Matt Bridges | 2012-01-26 | 1 | -1/+1 | |
|/ / | ||||||
* | | syncs 3-2-stable CHANGELOGs in master | Xavier Noria | 2012-01-26 | 1 | -0/+9 | |
| | | ||||||
* | | Revert "Merge pull request #4690 from jdutil/filter_password_confirmation" | José Valim | 2012-01-26 | 1 | -1/+1 | |
| | | | | | | | | | | This reverts commit eafa1c429835e099897a0da90bc39d9dbbb7ed4e, reversing changes made to f251437415f7b803f7a84118fcc970a111ace266. | |||||
* | | Merge pull request #4690 from jdutil/filter_password_confirmation | José Valim | 2012-01-26 | 1 | -1/+1 | |
|\ \ | | | | | | | Add :password_confirmation as a filtered param by default. | |||||
| * | | Add :password_confirmation as a filtered param by default. | Jeff Dutil | 2012-01-26 | 1 | -1/+1 | |
| | | | ||||||
* | | | disable automatic explain if there is no logger [closes #4671] | Xavier Noria | 2012-01-26 | 3 | -1/+20 | |
|/ / | ||||||
* | | Merge pull request #4689 from claudiob/add_rails32_release_date | Xavier Noria | 2012-01-26 | 6 | -6/+6 | |
|\ \ | | | | | | | Add release date of Rails 3.2.0 to documentation | |||||
| * | | Add release date of Rails 3.2.0 to documentation | claudiob | 2012-01-26 | 6 | -6/+6 | |
|/ / | ||||||
* | | Merge pull request #4687 from lest/patch-2 | José Valim | 2012-01-26 | 1 | -2/+2 | |
|\ \ | | | | | | | fix fixtures test as table_name is a string now | |||||
| * | | fix fixtures test as table_name is a string now | Sergey Nartimov | 2012-01-26 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #4684 from rossmeissl/patch-1 | Xavier Noria | 2012-01-25 | 1 | -1/+1 | |
|\ \ | | | | | | | Use `:rubygems` shortcut as standard Gemfile's `source` instead of explicit URL | |||||
| * | | Use `:rubygems` shortcut as standard Gemfile's `source` instead of explicit ↵ | Andy Rossmeissl | 2012-01-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | URL. Theoretically this would future-proof Gemfiles against possible (albeit unlikely) change in the rubygems URL. | |||||
* | | | Merge pull request #4685 from brainopia/fix_contribute_guide | Xavier Noria | 2012-01-25 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fix contributing guide to reflect preferred position on indentation | |||||
| * | | | Fix contributing guide to reflect preferred position on indentation | brainopia | 2012-01-26 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect recommendation from indenting after private/protected to not. Based on opinions of @spastorino, @jonleighton, @tenderlove https://github.com/rails/rails/pull/1838#issuecomment-1440281 https://en.twitter.com/#!/spastorino/status/142054749351575552 https://en.twitter.com/#!/tenderlove/status/142014046445641728 https://en.twitter.com/#!/jonleighton/status/142021813415841794 | |||||
* | | | Merge pull request #4686 from lest/patch-2 | José Valim | 2012-01-25 | 2 | -1/+6 | |
|\ \ \ | | | | | | | | | call to_s on value passed to table_name= | |||||
| * | | | call to_s on value passed to table_name= | Sergey Nartimov | 2012-01-26 | 2 | -1/+6 | |
|/ / / | ||||||
* | | | Use content_tag_for with array by default on scaffold. | José Valim | 2012-01-26 | 2 | -5/+5 | |
| | | | ||||||
* | | | Merge pull request #4679 from lest/patch-1 | José Valim | 2012-01-25 | 2 | -27/+37 | |
|\ \ \ | |/ / |/| | | AssetTagHelper improvements | |||||
| * | | reuse common video/audio tags code and do not modify options | Sergey Nartimov | 2012-01-26 | 2 | -25/+29 | |
| | | | ||||||
| * | | do not modify options in image_tag | Sergey Nartimov | 2012-01-26 | 2 | -2/+8 | |
| | | | ||||||
* | | | The primary key is always initialized in the @attributes hash to nil (unless | Aaron Patterson | 2012-01-25 | 5 | -7/+12 | |
|/ / | | | | | | | another value has been specified). | |||||
* | | Merge pull request #4676 from lest/patch-1 | José Valim | 2012-01-25 | 2 | -12/+22 | |
|\ \ | | | | | | | allow to pass multiple sources to audio/video tags without using array | |||||
| * | | allow to pass multiple sources to audio/video tags without using array | Sergey Nartimov | 2012-01-25 | 2 | -12/+22 | |
|/ / | ||||||
* | | Merge pull request #4529 from ask4prasath/refactor | Vijay Dev | 2012-01-25 | 1 | -8/+10 | |
|\ \ | | | | | | | Refactored class methods on address render test | |||||
| * | | Refactored class methods on address render test | prasath | 2012-01-19 | 1 | -8/+10 | |
| | | | ||||||
* | | | Merge pull request #4645 from brainopia/deprecate_datetime_local_offset | Aaron Patterson | 2012-01-25 | 4 | -17/+22 | |
|\ \ \ | | | | | | | | | Deprecate DateTime.local_offset | |||||
| * | | | Deprecate DateTime.local_offset | brainopia | 2012-01-25 | 4 | -17/+22 | |
|/ / / | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-26 | 12 | -31/+64 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Revert "Added Apache configuration for dynamic gzip content" | Vijay Dev | 2012-01-25 | 1 | -24/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fce92fd8a7e407b034d189a652af81a06ac98730. Reason: We want any config that goes into the guides to be 100% right and I'm not entirely sure that this one is it. We already had a similar config that was removed in https://github.com/rails/rails/commit/b1c20e37eccdfab7bb94d34f249c5e49256b9980 | |||||
| * | | minor text change [ci skip] | Vijay Dev | 2012-01-25 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix translate_error reference for Error#add documentation | Jonathan del Strother | 2012-01-25 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix callbacks order for destroying an object in validations guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | Also add around save to creating/updating callbacks order, and fix save example with no validation | |||||
| * | | Improve field error proc example in validations guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -7/+2 | |
| | | | ||||||
| * | | Change ActiveRecord::Errors to ActiveModel::Errors in guides | Carlos Antonio da Silva | 2012-01-25 | 6 | -14/+14 | |
| | | | | | | | | | | | | | | | | | | | | | Use ActiveModel::Errors in inflection example docs as well. Also fixes wrong information and link to locale file related to Errors#full_messages in I18n guide. | |||||
| * | | Fix custom validation methods section in AR validations and callbacks guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -2/+14 | |
| | | | | | | | | | | | | | | | | | | The methods validate_on_create and validate_on_update are not available anymore in Rails, this removes them from the guide and adds an example on how to use validate with the :on option. |