aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | mutations on the underlying hash should also mutate the discard setAaron Patterson2011-12-282-3/+24
* | rename @used to something a bit more meaningfulAaron Patterson2011-12-281-7/+7
* | mutations can't be done without the consent of our proxy object. ThisAaron Patterson2011-12-282-3/+62
* | again, use Set#subtractAaron Patterson2011-12-281-1/+1
* | Use Set#subtract and Set#merge for keeping track of used / unused keysAaron Patterson2011-12-281-15/+4
* | fix method visibilityAaron Patterson2011-12-281-15/+15
* | no need for bang bang :bomb:Aaron Patterson2011-12-281-1/+1
* | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_idsAaron Patterson2011-12-282-1/+11
|\ \
| * | allow reorder to affect eager loading correctlyMatt Jones + Scott Walker2011-12-282-1/+11
* | | Fix CIJon Leighton2011-12-285-25/+25
* | | app code in general wants Time.current, not Time.nowXavier Noria2011-12-281-3/+3
* | | Merge pull request #4222 from amatsuda/ar_predicate_builder_refactorAaron Patterson2011-12-281-35/+37
|\ \ \
| * | | refactor AR::PredicateBuilder.build_from_hashAkira Matsuda2011-12-291-35/+37
* | | | Merge pull request #4221 from tonycoco/masterJon Leighton2011-12-281-0/+1
|\ \ \ \
| * | | | Update railties/lib/rails/generators/actions.rbTony Coconate2011-12-281-0/+1
* | | | | Delete some stray linesJon Leighton2011-12-282-3/+0
| |/ / / |/| | |
* | | | Revert "Merge pull request #4220 from bensie/singleton-class-master"Jon Leighton2011-12-281-1/+14
* | | | Avoid deprecation warningJon Leighton2011-12-281-1/+1
* | | | Support establishing connection on ActiveRecord::Model.Jon Leighton2011-12-2825-230/+251
* | | | Support configuration on ActiveRecord::Model.Jon Leighton2011-12-2828-222/+498
* | | | 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
|\ \ \