aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3731 from HeeL/masterYehuda Katz2011-11-231-3/+14
|\
| * improved code stats calculation, check on multiline comments and rewrite rege...Sergey Parizhskiy2011-11-231-3/+14
* | Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_testYehuda Katz2011-11-231-3/+3
|\ \
| * | Warnings removed. (ambiguous first argument)kennyj2011-11-241-3/+3
| |/
* | Rely on a public contract between railties instead of accessing railtie metho...José Valim2011-11-2312-54/+94
* | 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
|\ \
| * | Fix #3737 AS::expand_cache_key generates wrong key in certain situations (par...Olek Janiszewski2011-11-232-3/+14
| * | Fix #3737 AS::expand_cache_key generates wrong key in certain situationsOlek Janiszewski2011-11-232-12/+14
| |/
* | Merge pull request #3735 from kennyj/fix_3728José Valim2011-11-233-6/+25
|\ \ | |/ |/|
| * 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?}Marc-Andre Lafortune2011-11-224-4/+30
* | Merge pull request #3724 from marcandre/media_defaultYehuda Katz2011-11-224-3/+6
|\ \
| * | Make explicit the default media when calling stylesheet_tag and change the de...Marc-Andre Lafortune2011-11-224-3/+6
| |/
* | 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 '.'lest2011-11-222-1/+4
* | | Merge pull request #3717 from lest/show-exceptions-refactorJosé Valim2011-11-227-68/+127
|\ \ \ | |/ / |/| |
| * | 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 valu...Xavier Noria2011-11-211-48/+48
* | Deprecate InstanceMethods namespace handling in ActiveSupport::Concern.José Valim2011-11-212-15/+7
* | Revert "tests predicates according to the boolean interpretation of their ret...Xavier Noria2011-11-212-51/+55
* | tests predicates according to the boolean interpretation of their return valu...Xavier Noria2011-11-212-55/+51
* | 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
* | 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 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
* | 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 valuegregolsen2011-11-172-4/+4
* | | Merge pull request #3696 from lest/fix-plugin-generatorJosé Valim2011-11-192-4/+22
|\ \ \
| * | | fix warning about instance variable in plugin generatorlest2011-11-191-7/+7
| * | | fix rails plugin new CamelCasedName buglest2011-11-192-4/+22
|/ / /
* | | Merge pull request #3695 from tobiassvn/partial_path_errorYehuda Katz2011-11-192-2/+14
|\ \ \
| * | | Meaningful errors for unexpected partial arguments. Fixes #3573Tobias Svensson2011-11-192-2/+14
* | | | Perf fixJon Leighton2011-11-192-2/+11
* | | | 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
|/ / /