aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4207 from nashby/deprecate-base64-encode64sAaron Patterson2011-12-286-9/+15
|\
| * deprecate Base64.encode64s from AS. Use Base64.strict_encode64 insteadVasiliy Ermolovich2011-12-276-9/+15
* | Add CHANGELOG entrySantiago Pastorino2011-12-281-0/+2
* | Merge pull request #4220 from bensie/singleton-class-masterAaron Patterson2011-12-281-14/+1
|\ \
| * | Further simplify singleton_class checking in class_attributeJames Miller2011-12-281-14/+1
|/ /
* | Merge pull request #4218 from bogdan/reset_runner_callbacksJosé Valim2011-12-281-6/+8
|\ \
| * | Refactor AS::CallbacksBogdan Gusiev2011-12-281-6/+8
|/ /
* | Merge pull request #4213 from amatsuda/ar_where_array_of_nil_and_a_valueJon Leighton2011-12-281-2/+5
|\ \
| * | where(foo: [1, nil]) becomes "WHERE foo = 1 OR foo IS NULL"Akira Matsuda2011-12-281-1/+4
| * | no need to compact an already compacted ArrayAkira Matsuda2011-12-281-1/+1
| |/
* | Bump to rack 1.4.0Santiago Pastorino2011-12-281-1/+1
* | Merge pull request #4153 from alexeymuranov/my_fix_for_prefix_suffix_fixtures...Jon Leighton2011-12-283-25/+81
|\ \ | |/ |/|
| * Use the correct table name from fixtureAlexey Muranov2011-12-281-2/+2
| * Fix a fixtures test case with table prefix/suffixAlexey Muranov2011-12-272-23/+79
* | Merge pull request #4201 from arunagw/no_worry_about_1.9.2Santiago Pastorino2011-12-271-2/+1
|\ \
| * | Revert "This conditions is required to work with database create task. 1.9.2 ...Arun Agrawal2011-12-271-2/+1
| |/
* | Merge pull request #4198 from castlerock/remove_GC_checks_for_ruby19Santiago Pastorino2011-12-271-10/+4
|\ \
| * | remove conditions for GC::Profiler in ruby19Vishnu Atrai2011-12-271-10/+4
| |/
* | Merge pull request #4199 from cibernox/patch-1José Valim2011-12-261-3/+1
|\ \ | |/ |/|
| * Removed RUBY_ENGINE checks for ruby18Miguel Camba2011-12-271-3/+1
|/
* Merge pull request #4195 from castlerock/remove_19_condition_for_GC_ProfilerSantiago Pastorino2011-12-261-9/+6
|\
| * GC::Profiler available in ruby19Vishnu Atrai2011-12-271-9/+6
* | Merge pull request #4197 from nashby/refactor-range-includeJosé Valim2011-12-261-3/+1
|\ \
| * | refactor Range#include? for range valueVasiliy Ermolovich2011-12-261-3/+1
| |/
* | Merge pull request #4194 from castlerock/remove_18_test_supportJosé Valim2011-12-262-112/+2
|\ \ | |/ |/|
| * remove ForClassicTestUnit support for ruby 1.8Vishnu Atrai2011-12-262-112/+2
|/
* Merge pull request #4193 from nashby/remove-old-rexml-security-fixJosé Valim2011-12-262-48/+0
|\
| * remove rexml security fix for rubies 1.8Vasiliy Ermolovich2011-12-262-48/+0
|/
* Refactor RouteInspectorPiotr Sarnacki2011-12-261-32/+69
* Merge pull request #4150 from Karunakar/new_PRSantiago Pastorino2011-12-265-8/+9
|\
| * Moving to logger methods to ActiveSupport LoggerKarunakar (Ruby)2011-12-244-7/+8
| * change LogKarunakar (Ruby)2011-12-241-1/+1
* | Revert "Merge pull request #4154 from nashby/include-blank-date-helper"Piotr Sarnacki2011-12-262-22/+2
* | Merge pull request #4154 from nashby/include-blank-date-helperPiotr Sarnacki2011-12-262-2/+22
|\ \
| * | add ability to set a prompt string in include_blank option for date helpers, ...Vasiliy Ermolovich2011-12-242-2/+22
* | | Correctly display rack apps with dynamic constraints in RoutesInspectorPiotr Sarnacki2011-12-263-2/+28
* | | Merge pull request #4118 from nashby/remove-file-to-pathXavier Noria2011-12-266-15/+2
|\ \ \
| * | | remove File#to_path aliasVasiliy Ermolovich2011-12-256-15/+2
* | | | Merge pull request #4188 from castlerock/remove_1.8_testJosé Valim2011-12-251-17/+0
|\ \ \ \
| * | | | Test::Unit::Util::BacktraceFilter not available in ruby19 test/unitVishnu Atrai2011-12-261-17/+0
| |/ / /
* | | | Merge pull request #4189 from bogdan/non_keyed_callbacksJosé Valim2011-12-251-3/+2
|\ \ \ \ | |/ / / |/| | |
| * | | AS::Callbacks: improved __define_runner performanceBogdan Gusiev2011-12-251-3/+2
|/ / /
* | | removes the compatibility method Module#method_namesXavier Noria2011-12-255-13/+3
* | | removes the compatibility method Module#instance_method_namesXavier Noria2011-12-254-15/+7
* | | Merge pull request #4187 from castlerock/basic_object_in_19José Valim2011-12-251-16/+9
|\ \ \
| * | | ::BasicObject always defined in ruby 19Vishnu Atrai2011-12-261-16/+9
|/ / /
* | | Merge pull request #4186 from lest/remove-1-8-codeXavier Noria2011-12-251-11/+6
|\ \ \
| * | | ruby 1.9 returns method names as symbolsSergey Nartimov2011-12-251-11/+6
|/ / /
* | | Merge pull request #4185 from nashby/module-anonymousXavier Noria2011-12-252-7/+3
|\ \ \
| * | | Module#name returns nil for anonymous class in ruby 1.9Vasiliy Ermolovich2011-12-252-7/+3
|/ / /