aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4788 from arunagw/warning_remove_shadowing_varSantiago Pastorino2012-01-311-2/+2
|\ | | | | warning removed: shadowing outer local variable - klass
| * warning removed: shadowing outer local variable - klassArun Agrawal2012-01-311-2/+2
|/
* Merge pull request #4782 from lest/patch-1José Valim2012-01-311-1/+1
|\ | | | | fix assets test
| * fix assets testSergey Nartimov2012-01-311-1/+1
|/
* Merge pull request #4763 from kennyj/fix_4754Jon Leighton2012-01-312-1/+17
|\ | | | | [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
| * Fix GH #4754. Remove double-quote when using ANSI_QUOTESkennyj2012-01-312-1/+17
| |
* | Merge pull request #4732 from pwim/refactor-dynamic-matchJon Leighton2012-01-303-28/+60
|\ \ | | | | | | Refactor dynamic match
| * | Use conditional instead of tryPaul McMahon2012-01-311-1/+1
| | |
| * | Decouple finding matching class from instantiationPaul McMahon2012-01-291-22/+29
| | |
| * | Move argument validation into matchPaul McMahon2012-01-283-1/+13
| | |
| * | Extract different DynamicFinderMatch subclassesPaul McMahon2012-01-281-26/+39
| | |
* | | Merge pull request #4769 from sikachu/failing-testXavier Noria2012-01-301-1/+1
|\ \ \ | | | | | | | | Fix failing test from [7619bcf2]
| * | | Fix failing test from [7619bcf2]Prem Sichanugrist2012-01-301-1/+1
| | | |
* | | | query cache instrumentation should included the bindings in the payload ↵Xavier Noria2012-01-301-1/+1
|/ / / | | | | | | | | | [closes #4750]
* | | rewrites a couple of alternations in regexps as character classesXavier Noria2012-01-302-2/+2
| | | | | | | | | | | | | | | Character classes are the specific regexp construct to express alternation of individual characters.
* | | Merge pull request #4767 from lest/patch-2José Valim2012-01-302-56/+26
|\ \ \ | | | | | | | | merge MRI performance methods into one file
| * | | merge MRI performance methods into one fileSergey Nartimov2012-01-302-56/+26
|/ / /
* | | Merge pull request #4765 from vijaydev/fix_4764Santiago Pastorino2012-01-301-1/+1
|\ \ \ | | | | | | | | Fixes #4764 - remove generated new line in routes.rb on scaffold generation
| * | | Fixes #4764 - remove generated new line in routes.rb on scaffold generationVijay Dev2012-01-311-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | As explained in #4764, when destroying a scaffold, routes.rb loses a new line. This seems to happen because a new line is added while generating the route and the destroy generator removes it. However, this causes a problem if the routes file is manually edited to remove such new lines. This commit just removes that extra new line from added in the first place.
* | | Merge pull request #4753 from rahul100885/rahul100885_workSantiago Pastorino2012-01-301-14/+16
|\ \ \ | | |/ | |/| Used block to make sure file get auto closed after use
| * | Used block to make sure file get auto closed after useRahul P. Chaudhari2012-01-301-14/+16
|/ /
* | Merge pull request #4745 from lest/patch-1José Valim2012-01-291-6/+2
|\ \ | | | | | | remove ruby 1.8 support code
| * | remove ruby 1.8 support codeSergey Nartimov2012-01-291-6/+2
|/ /
* | Merge pull request #4744 from ndbroadbent/replace_for_loops_with_enumerablesSantiago Pastorino2012-01-2911-33/+33
|\ \ | | | | | | Replaced all 'for' loops with Enumerable#each
| * | Use block form of 'File.open' so that File object is auto closed at endNathan Broadbent2012-01-302-14/+14
| | |
| * | Replaced all 'for' loops with Enumerable#eachNathan Broadbent2012-01-3011-19/+19
| | |
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 22:14:09 +0000