aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #4709 from ask4prasath/refactor_validation_testAaron Patterson2012-01-271-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removed unwanted intializer and replaced with ruby default collect methodprasath2012-01-271-2/+1
* | | | | Merge pull request #4722 from kennyj/fix_4708Aaron Patterson2012-01-272-2/+6
|\ \ \ \ \
| * | | | | Remove redundant instance_variables (@colorize_logging)kennyj2012-01-272-2/+6
* | | | | | Merge pull request #4724 from kennyj/fix_warning_20120128Aaron Patterson2012-01-271-1/+1
|\ \ \ \ \ \
| * | | | | | Fix warning. assigned but unused variable - path_paramskennyj2012-01-281-1/+1
| |/ / / / /
* | | | | | Merge pull request #4721 from ab9/fix_has_secure_password_docJosé Valim2012-01-271-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix example code in documentation for has_secure_passwordAaron Beckerman2012-01-281-1/+1
|/ / / / /
* | | | | Merge pull request #4715 from pwim/find-create-multi-argsJon Leighton2012-01-272-1/+12
|\ \ \ \ \
| * | | | | Fix regression from Rails 3.1Paul McMahon2012-01-272-1/+12
* | | | | | Disagree with @spastorino, @jonleighton, @tenderlove on 51ccb7f59c83120bf6869...Jeremy Kemper2012-01-261-1/+1
|/ / / / /
* | | | | Merge pull request #4713 from carlosantoniodasilva/form-label-forPiotr Sarnacki2012-01-263-1/+7
|\ \ \ \ \
| * | | | | Do not generate label for attribute when giving nilCarlos Antonio da Silva2012-01-263-1/+7
|/ / / / /
* | | | | Revert usage of safe constantizeJosé Valim2012-01-261-1/+3
* | | | | Merge pull request #4711 from atambo/masterJosé Valim2012-01-262-3/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | safe_constantize should handle wrong constant name NameErrors Fixes #4710Alex Tambellini2012-01-262-3/+4
|/ / / /
* | | | bumping journey to 1.0.1Aaron Patterson2012-01-261-1/+1
* | | | Merge pull request #4696 from rafaelfranca/issue-4653Aaron Patterson2012-01-261-2/+0
* | | | 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.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
* | | | Merge pull request #4690 from jdutil/filter_password_confirmationJosé Valim2012-01-261-1/+1
|\ \ \ \
| * | | | 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 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 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 U...Andy Rossmeissl2012-01-251-1/+1
* | | | | Merge pull request #4685 from brainopia/fix_contribute_guideXavier Noria2012-01-251-1/+1
|\ \ \ \ \
| * | | | | Fix contributing guide to reflect preferred position on indentationbrainopia2012-01-261-1/+1
| |/ / / /
* | | | | Merge pull request #4686 from lest/patch-2José Valim2012-01-252-1/+6
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|/ / / /
* | | | Merge pull request #4676 from lest/patch-1José Valim2012-01-252-12/+22
|\ \ \ \
| * | | | 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 testprasath2012-01-191-8/+10
* | | | | Merge pull request #4645 from brainopia/deprecate_datetime_local_offsetAaron Patterson2012-01-254-17/+22
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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
| * | | minor text change [ci skip]Vijay Dev2012-01-251-1/+1