aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4743 from atd/patch-1José Valim2012-01-291-1/+1
|\ | | | | Add 'image/pjpeg' format used by IE
| * Add 'image/pjpeg' format used by IE Antonio Tapiador2012-01-291-1/+1
|/ | | http://msdn.microsoft.com/en-us/library/ms775147%28v=vs.85%29.aspx#_replace
* Merge pull request #4739 from nashby/refactor-date-helperSantiago Pastorino2012-01-292-15/+9
|\ | | | | tiny refactoring of date_helper
| * tiny refactoringVasiliy Ermolovich2012-01-292-15/+9
| | | | | | | | | | use :default option with translate method instead of condition simplify separator method
* | Merge pull request #4741 from pacoguzman/initialize_variable_not_neededSantiago Pastorino2012-01-291-2/+1
|\ \ | | | | | | Remove initialize variable columnn, not needed
| * | Remove initialize variable columnn, not neededPaco Guzman2012-01-291-2/+1
|/ /
* | Merge pull request #4740 from castlerock/remove_autoload_UrlWriterJosé Valim2012-01-291-1/+0
|\ \ | |/ |/| remove autoload UrlWriter, no longer exists
| * remove autoload UrlWriter, no longer existsVishnu Atrai2012-01-291-1/+0
|/
* Merge pull request #4731 from ndbroadbent/revert_build_original_fullpathSantiago Pastorino2012-01-271-1/+9
|\ | | | | Reverted build_original_fullpath method refactor
| * Reverted build_original_fullpath method, as per discussion at ↵Nathan Broadbent2012-01-281-1/+9
|/ | | | https://github.com/rails/rails/pull/4470/files#r393461
* Merge pull request #4730 from carlosantoniodasilva/patch-1Santiago Pastorino2012-01-271-1/+0
|\ | | | | Remove not used env[] call in routing_test.
| * Remove not used env[] call in routing_test. Carlos Antonio da Silva2012-01-271-1/+0
|/ | | The commit 4c321c6d42b6e35f9ead12eb1dccdead03c5abf4 removes the path_params variable assignment, actually the entire line is not used at all.
* Inline the prefix assignment so it doesnt look so daftDavid Heinemeier Hansson2012-01-271-2/+1
|
* Revert "Fix expanding cache key for single element arrays"David Heinemeier Hansson2012-01-272-16/+8
| | | | | | This reverts commit abe915f23777efe10f17d611bf5718ca855a0704. This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.
* Merge pull request #4726 from rafaelfranca/create_join_tableAaron Patterson2012-01-278-5/+194
|\ | | | | Add create_join_table migration helper to create HABTM join tables
| * Add `create_join_table` migration helper to create HABTM join tablesRafael Mendonça França2012-01-278-5/+194
| |
* | fix a small typo [ci skip]Vijay Dev2012-01-271-1/+1
| |
* | Merge pull request #4709 from ask4prasath/refactor_validation_testAaron Patterson2012-01-271-2/+1
|\ \ | |/ |/| Removed unwanted intializer and replaced with ruby default collect method
| * 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)
| * | 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_params
| * | | 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 documentation for has_secure_password
| * | 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.1
| * | Fix regression from Rails 3.1Paul McMahon2012-01-272-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 Kemper2012-01-261-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-forPiotr Sarnacki2012-01-263-1/+7
|\ \ | | | | | | Do not generate label for attribute when giving nil
| * | 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
|\ \ | |/ |/| 3.2 safe_constantize should handle wrong constant name NameErrors Fixes #4710
| * 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
| | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:55:39 +0000