aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bumping journey to 1.0.1Aaron Patterson2012-01-261-1/+1
|
* Merge pull request #4696 from rafaelfranca/issue-4653Aaron Patterson2012-01-261-2/+0
| | | | Remove extra attributes from HABTM join tables in AR tests
* global variables may not be set depending on the match. fixes #4703Aaron Patterson2012-01-262-1/+8
|
* Merge pull request #4699 from mattdbridges/typo_fixVijay Dev2012-01-261-1/+1
|\ | | | | Fixed small typo in ActveRecord/CHANGELOG.md
| * Fixed small typo in ActveRecord/CHANGELOG.mdMatt Bridges2012-01-261-1/+1
|/
* syncs 3-2-stable CHANGELOGs in masterXavier Noria2012-01-261-0/+9
|
* Revert "Merge pull request #4690 from jdutil/filter_password_confirmation"José Valim2012-01-261-1/+1
| | | | | This reverts commit eafa1c429835e099897a0da90bc39d9dbbb7ed4e, reversing changes made to f251437415f7b803f7a84118fcc970a111ace266.
* Merge pull request #4690 from jdutil/filter_password_confirmationJosé Valim2012-01-261-1/+1
|\ | | | | Add :password_confirmation as a filtered param by default.
| * Add :password_confirmation as a filtered param by default.Jeff Dutil2012-01-261-1/+1
| |
* | disable automatic explain if there is no logger [closes #4671]Xavier Noria2012-01-263-1/+20
|/
* Merge pull request #4689 from claudiob/add_rails32_release_dateXavier Noria2012-01-266-6/+6
|\ | | | | Add release date of Rails 3.2.0 to documentation
| * Add release date of Rails 3.2.0 to documentationclaudiob2012-01-266-6/+6
|/
* Merge pull request #4687 from lest/patch-2José Valim2012-01-261-2/+2
|\ | | | | fix fixtures test as table_name is a string now
| * fix fixtures test as table_name is a string nowSergey Nartimov2012-01-261-2/+2
|/
* Merge pull request #4684 from rossmeissl/patch-1Xavier Noria2012-01-251-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 Rossmeissl2012-01-251-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_guideXavier Noria2012-01-251-1/+1
|\ \ | | | | | | Fix contributing guide to reflect preferred position on indentation
| * | Fix contributing guide to reflect preferred position on indentationbrainopia2012-01-261-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-2José Valim2012-01-252-1/+6
|\ \ | | | | | | call to_s on value passed to table_name=
| * | call to_s on value passed to table_name=Sergey Nartimov2012-01-262-1/+6
|/ /
* | Use content_tag_for with array by default on scaffold.José Valim2012-01-262-5/+5
| |
* | Merge pull request #4679 from lest/patch-1José Valim2012-01-252-27/+37
|\ \ | |/ |/| AssetTagHelper improvements
| * reuse common video/audio tags code and do not modify optionsSergey Nartimov2012-01-262-25/+29
| |
| * do not modify options in image_tagSergey Nartimov2012-01-262-2/+8
| |
* | The primary key is always initialized in the @attributes hash to nil (unlessAaron Patterson2012-01-255-7/+12
|/ | | | another value has been specified).
* Merge pull request #4676 from lest/patch-1José Valim2012-01-252-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 arraySergey Nartimov2012-01-252-12/+22
|/
* Merge pull request #4529 from ask4prasath/refactorVijay Dev2012-01-251-8/+10
|\ | | | | Refactored class methods on address render test
| * Refactored class methods on address render testprasath2012-01-191-8/+10
| |
* | Merge pull request #4645 from brainopia/deprecate_datetime_local_offsetAaron Patterson2012-01-254-17/+22
|\ \ | | | | | | Deprecate DateTime.local_offset
| * | Deprecate DateTime.local_offsetbrainopia2012-01-254-17/+22
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-2612-31/+64
|\ \
| * | Revert "Added Apache configuration for dynamic gzip content"Vijay Dev2012-01-251-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 Dev2012-01-251-1/+1
| | |
| * | Fix translate_error reference for Error#add documentationJonathan del Strother2012-01-251-1/+1
| | |
| * | Fix callbacks order for destroying an object in validations guideCarlos Antonio da Silva2012-01-251-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 guideCarlos Antonio da Silva2012-01-251-7/+2
| | |
| * | Change ActiveRecord::Errors to ActiveModel::Errors in guidesCarlos Antonio da Silva2012-01-256-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 guideCarlos Antonio da Silva2012-01-251-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.
| * | remove extra 'the'Rohit Arondekar2012-01-251-1/+1
| | |
| * | Added Apache configuration for dynamic gzip contentleprasmurf2012-01-231-1/+24
| | |
| * | use CamelCase convention for "tag" model nameciastek2012-01-231-1/+1
| | |
| * | example bracket errorDamian Le Nouaille2012-01-231-1/+1
| | |
| * | "will be used throughout all the views for posts." could suggest, that ↵ciastek2012-01-231-1/+1
| | | | | | | | | | | | code's modification is somehow related to posts, while it's application-wide
| * | Documented the :use_two_digit_numbers optionLennart Fridén2012-01-221-0/+24
| | |
| * | Fixed typo in 'cast'.Aleksey Gureiev2012-01-211-1/+1
| | |
* | | Merge pull request #4644 from ask4prasath/refactor_testAaron Patterson2012-01-251-4/+3
|\ \ \ | | | | | | | | Replaced unwanted method and added to accessor for getter history
| * | | Removing unwanted method and adding to accessor for getter historyprasath2012-01-251-4/+3
| | |/ | |/|
* | | Merge pull request #4646 from lest/patch-1Aaron Patterson2012-01-252-39/+30
|\ \ \ | | | | | | | | no need in separate MiniTest modules
| * | | no need in separate MiniTest modulesSergey Nartimov2012-01-242-39/+30
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 16:53:53 +0000