aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Optimize cache expansion by skipping rails cache id in nested keys.José Valim2011-11-232-58/+64
|
* Merge pull request #3738 from exviva/issues/3737_AS_cache_expand_cache_keyJosé Valim2011-11-232-13/+26
|\ | | | | Issues/3737 AS::Cache.expand_cache_key
| * Fix #3737 AS::expand_cache_key generates wrong key in certain situations ↵Olek Janiszewski2011-11-232-3/+14
| | | | | | | | | | | | | | (part 2) `nil` and `false` both expand to `""` (empty string), while `true` expands to `"true"`; `false` should expand to `"false"`
| * Fix #3737 AS::expand_cache_key generates wrong key in certain situationsOlek Janiszewski2011-11-232-12/+14
| | | | | | | | | | `cache_key` method is never called when the argument is a 1-element array with something that responds to `cache_key`
* | Merge pull request #3735 from kennyj/fix_3728José Valim2011-11-233-6/+25
|\ \ | |/ |/| Fix #3728 Remove unreachable code, and add additional testcases.
| * Remove unreachable code, and add additional testcases.kennyj2011-11-243-6/+25
|/
* Merge pull request #3725 from marcandre/twz_eqlYehuda Katz2011-11-224-4/+30
|\ | | | | Fix inconsistencies with Time{WithZone}#{hash,eql?}
| * Fix inconsistencies with Time{WithZone}#{hash,eql?}Marc-Andre Lafortune2011-11-224-4/+30
| |
* | Merge pull request #3724 from marcandre/media_defaultYehuda Katz2011-11-224-3/+6
|\ \ | | | | | | stylesheet_tag default's media is "screen"
| * | Make explicit the default media when calling stylesheet_tag and change the ↵Marc-Andre Lafortune2011-11-224-3/+6
| |/ | | | | | | default generators.
* | Merge pull request #3718 from lest/fix-javascript-include-tagJosé Valim2011-11-222-1/+4
|\ \ | | | | | | javascript_include_tag should add '.js' to sources that contain '.'
| * | javascript_include_tag should add '.js' to sources that contain '.'lest2011-11-222-1/+4
| | |
* | | Merge pull request #3717 from lest/show-exceptions-refactorJosé Valim2011-11-227-68/+127
|\ \ \ | |/ / |/| | Show exceptions refactor: controller should be responsible for choice to show exceptions
| * | deprecation warning, changelog entrylest2011-11-222-1/+7
| | |
| * | move show_detailed_exceptions? to Rescue modulelest2011-11-224-7/+14
| | |
| * | refactor show exceptions testslest2011-11-222-42/+78
| | |
| * | add ActionController::Metal#show_detailed_exceptions?lest2011-11-224-29/+39
| | |
* | | remove nodoc on OrderedHashVijay Dev2011-11-221-1/+1
|/ /
* | tests predicates according to the boolean interpretation of their return ↵Xavier Noria2011-11-211-48/+48
| | | | | | | | | | | | value, not expecting specifically true or false Respecting Genuine assert_equal false Edition
* | Deprecate InstanceMethods namespace handling in ActiveSupport::Concern.José Valim2011-11-212-15/+7
| | | | | | | | This avoids the unnecessary "yo dawg, I heard you like include, so I put a module that includes your module when it is included" approach when building extensions.
* | Revert "tests predicates according to the boolean interpretation of their ↵Xavier Noria2011-11-212-51/+55
| | | | | | | | | | | | | | | | | | return value, not expecting specifically true or false" Reason: there were some genuine tests for false when reading values, going to revise those ones. This reverts commit a539a5e3f3be68f027d3dfe43f88dc9f0642c743.
* | tests predicates according to the boolean interpretation of their return ↵Xavier Noria2011-11-212-55/+51
| | | | | | | | value, not expecting specifically true or false
* | cache entry: options[:compressed] is a regular flag, no need for !!Xavier Noria2011-11-212-4/+4
| |
* | adds a comment to clarify an edge caseXavier Noria2011-11-211-0/+3
| |
* | a couple of spurious spaces I saw in passingXavier Noria2011-11-211-2/+2
| |
* | Remove the -h option to dbconsole which is the shorter form of --headerVijay Dev2011-11-221-1/+1
| | | | | | | | | | | | This is done since the -h option to dbconsole hides the conventional -h for help and forces users to use --help to see the usage options for dbconsole.
* | oops! I suck! :bomb:Aaron Patterson2011-11-201-1/+0
| |
* | fixing tests on ruby 1.8Aaron Patterson2011-11-201-1/+3
| |
* | Merge pull request #3701 from arunagw/arel_bumpAaron Patterson2011-11-191-1/+1
|\ \ | | | | | | Bump Arel
| * | Bump ArelArun Agrawal2011-11-201-1/+1
|/ /
* | removing deprecated methodsAaron Patterson2011-11-193-26/+0
| |
* | Revert "copy options keys to the right place so that undo will work correctly"Aaron Patterson2011-11-191-4/+10
| | | | | | | | This reverts commit 3178cc9a80262d3bf7754f3507ef60243b46634f.
* | adding visitors to the respective adaptersAaron Patterson2011-11-192-0/+2
| |
* | pushing caching and visitors down to the connectionAaron Patterson2011-11-1913-213/+181
| |
* | Merge pull request #3668 from gregolsen/api_docstring_fixSantiago Pastorino2011-11-192-4/+4
|\ \ | | | | | | updating API docstring so that user can infer default value
| * | updating API docstring so that user can infer default valuegregolsen2011-11-172-4/+4
| | |
* | | Merge pull request #3696 from lest/fix-plugin-generatorJosé Valim2011-11-192-4/+22
|\ \ \ | | | | | | | | fix rails plugin new CamelCasedName bug
| * | | fix warning about instance variable in plugin generatorlest2011-11-191-7/+7
| | | |
| * | | fix rails plugin new CamelCasedName buglest2011-11-192-4/+22
|/ / / | | | | | | | | | refs #3684
* | | Merge pull request #3695 from tobiassvn/partial_path_errorYehuda Katz2011-11-192-2/+14
|\ \ \ | | | | | | | | Meaningful errors for unexpected partial arguments. Fixes #3573
| * | | Meaningful errors for unexpected partial arguments. Fixes #3573Tobias Svensson2011-11-192-2/+14
| | | |
* | | | Perf fixJon Leighton2011-11-192-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're deleting all records in an association, don't add a IN(..) clause to the query. Fixes #3672.
* | | | Add missing CHANGELOG entry for #3678. Closes #3678.Jon Leighton2011-11-191-0/+4
| | | |
* | | | Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685.Jon Leighton2011-11-193-2/+21
| | | |
* | | | Bump sprockets to 2.1.1Jon Leighton2011-11-191-1/+1
|/ / /
* | | Merge pull request #3687 from kennyj/fix_3678-2Jon Leighton2011-11-192-21/+3
|\ \ \ | | | | | | | | Use `show index from`. We could fix `pk_and_sequence_for` method's performance problem (GH #3678)
| * | | Use `show index from`. We could fix `pk_and_sequence_for` method's ↵kennyj2011-11-192-21/+3
| | | | | | | | | | | | | | | | performance problem (GH #3678)
* | | | Verify that #3690 has been closed by previous changes to the mysqlJon Leighton2011-11-193-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adapters. These tests fail on the v3.1.2 tag. Closes #3690.
* | | | Merge pull request #3689 from arunagw/warning_removed_actionpackYehuda Katz2011-11-181-1/+1
|\ \ \ \ | |/ / / |/| | | Warning removed for shadowing variable
| * | | Warning removed for shadowing variableArun Agrawal2011-11-191-1/+1
|/ / /