| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | Decouple finding matching class from instantiation | Paul McMahon | 2012-01-29 | 1 | -22/+29 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Move argument validation into match | Paul McMahon | 2012-01-28 | 3 | -1/+13 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Extract different DynamicFinderMatch subclasses | Paul McMahon | 2012-01-28 | 1 | -26/+39 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #4769 from sikachu/failing-test | Xavier Noria | 2012-01-30 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix failing test from [7619bcf2] | |||||
| | * | | | | | | | | Fix failing test from [7619bcf2] | Prem Sichanugrist | 2012-01-30 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | query cache instrumentation should included the bindings in the payload ↵ | Xavier Noria | 2012-01-30 | 1 | -1/+1 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | [closes #4750] | |||||
| * | | | | | | | | rewrites a couple of alternations in regexps as character classes | Xavier Noria | 2012-01-30 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Character classes are the specific regexp construct to express alternation of individual characters. | |||||
| * | | | | | | | | Merge pull request #4767 from lest/patch-2 | José Valim | 2012-01-30 | 2 | -56/+26 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | merge MRI performance methods into one file | |||||
| | * | | | | | | | | merge MRI performance methods into one file | Sergey Nartimov | 2012-01-30 | 2 | -56/+26 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Merge pull request #4765 from vijaydev/fix_4764 | Santiago Pastorino | 2012-01-30 | 1 | -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 generation | Vijay Dev | 2012-01-31 | 1 | -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_work | Santiago Pastorino | 2012-01-30 | 1 | -14/+16 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Used block to make sure file get auto closed after use | |||||
| | * | | | | | | | Used block to make sure file get auto closed after use | Rahul P. Chaudhari | 2012-01-30 | 1 | -14/+16 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #4745 from lest/patch-1 | José Valim | 2012-01-29 | 1 | -6/+2 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | remove ruby 1.8 support code | |||||
| | * | | | | | | | remove ruby 1.8 support code | Sergey Nartimov | 2012-01-29 | 1 | -6/+2 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #4744 from ndbroadbent/replace_for_loops_with_enumerables | Santiago Pastorino | 2012-01-29 | 11 | -33/+33 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Replaced all 'for' loops with Enumerable#each | |||||
| | * | | | | | | | Use block form of 'File.open' so that File object is auto closed at end | Nathan Broadbent | 2012-01-30 | 2 | -14/+14 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Replaced all 'for' loops with Enumerable#each | Nathan Broadbent | 2012-01-30 | 11 | -19/+19 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #4743 from atd/patch-1 | José Valim | 2012-01-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Add 'image/pjpeg' format used by IE | |||||
| | * | | | | | | | Add 'image/pjpeg' format used by IE | Antonio Tapiador | 2012-01-29 | 1 | -1/+1 | |
| |/ / / / / / / | | | | | | | | | | | | | | | http://msdn.microsoft.com/en-us/library/ms775147%28v=vs.85%29.aspx#_replace | |||||
| * | | | | | | | Merge pull request #4739 from nashby/refactor-date-helper | Santiago Pastorino | 2012-01-29 | 2 | -15/+9 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | tiny refactoring of date_helper | |||||
| | * | | | | | | | tiny refactoring | Vasiliy Ermolovich | 2012-01-29 | 2 | -15/+9 | |
| | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | use :default option with translate method instead of condition simplify separator method | |||||
| * | | | | | | | Merge pull request #4741 from pacoguzman/initialize_variable_not_needed | Santiago Pastorino | 2012-01-29 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Remove initialize variable columnn, not needed | |||||
| | * | | | | | | Remove initialize variable columnn, not needed | Paco Guzman | 2012-01-29 | 1 | -2/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #4740 from castlerock/remove_autoload_UrlWriter | José Valim | 2012-01-29 | 1 | -1/+0 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | remove autoload UrlWriter, no longer exists | |||||
| | * | | | | | remove autoload UrlWriter, no longer exists | Vishnu Atrai | 2012-01-29 | 1 | -1/+0 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #4731 from ndbroadbent/revert_build_original_fullpath | Santiago Pastorino | 2012-01-27 | 1 | -1/+9 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Reverted build_original_fullpath method refactor | |||||
| | * | | | | | Reverted build_original_fullpath method, as per discussion at ↵ | Nathan Broadbent | 2012-01-28 | 1 | -1/+9 | |
| |/ / / / / | | | | | | | | | | | | | | | | https://github.com/rails/rails/pull/4470/files#r393461 | |||||
| * | | | | | Merge pull request #4730 from carlosantoniodasilva/patch-1 | Santiago Pastorino | 2012-01-27 | 1 | -1/+0 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | Remove not used env[] call in routing_test. | |||||
| | * | | | | Remove not used env[] call in routing_test. | Carlos Antonio da Silva | 2012-01-27 | 1 | -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 daft | David Heinemeier Hansson | 2012-01-27 | 1 | -2/+1 | |
| | | | | | ||||||
| * | | | | Revert "Fix expanding cache key for single element arrays" | David Heinemeier Hansson | 2012-01-27 | 2 | -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_table | Aaron Patterson | 2012-01-27 | 8 | -5/+194 | |
| |\ \ \ \ | | | | | | | | | | | Add create_join_table migration helper to create HABTM join tables | |||||
| | * | | | | Add `create_join_table` migration helper to create HABTM join tables | Rafael Mendonça França | 2012-01-27 | 8 | -5/+194 | |
| | | | | | | ||||||
| * | | | | | fix a small typo [ci skip] | Vijay Dev | 2012-01-27 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #4709 from ask4prasath/refactor_validation_test | Aaron Patterson | 2012-01-27 | 1 | -2/+1 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | Removed unwanted intializer and replaced with ruby default collect method | |||||
| | * | | | | Removed unwanted intializer and replaced with ruby default collect method | prasath | 2012-01-27 | 1 | -2/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #4722 from kennyj/fix_4708 | Aaron Patterson | 2012-01-27 | 2 | -2/+6 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove redundant instance variables (@colorize_logging) | |||||
| | * | | | | | Remove redundant instance_variables (@colorize_logging) | kennyj | 2012-01-27 | 2 | -2/+6 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #4724 from kennyj/fix_warning_20120128 | Aaron Patterson | 2012-01-27 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix warning. assigned but unused variable - path_params | |||||
| | * | | | | | | 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 | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |