aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Deprecate implicit eager loading. Closes #950.Jon Leighton2011-12-2927-99/+181
| | |
* | | Merge pull request #4231 from nashby/remove-constantize-ruby-18José Valim2011-12-291-39/+24
|\ \ \ | | | | | | | | remove ruby 1.8 checking in constantize method
| * | | remove ruby 1.8 checking in constantize methodVasiliy Ermolovich2011-12-291-39/+24
|/ / /
* | | Merge pull request #4230 from alovak/patch-1José Valim2011-12-291-3/+3
|\ \ \ | |_|/ |/| | Fix rails/generators/base.rb documentation for hook_for
| * | Fix rails/generators/base.rb documentation for hook_forPavel Gabriel2011-12-291-3/+3
|/ /
* | simplify sweep now that discard and flashes are in syncAaron Patterson2011-12-281-8/+2
| |
* | 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
| | | | | | | | is one benefit of choosing composition over inheritance.
* | 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 correctly
| * | 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_hash
| * | | refactor AR::PredicateBuilder.build_from_hashAkira Matsuda2011-12-291-35/+37
| | | |
* | | | Merge pull request #4221 from tonycoco/masterJon Leighton2011-12-281-0/+1
|\ \ \ \ | | | | | | | | | | Rails template creation issue
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 90df0d4f687596943bda108ab0b98dd99cacd46b, reversing changes made to 5e6fc81d63837559a393c173eade281ddeb687dd. Reason: build breakage
* | | | Avoid deprecation warningJon Leighton2011-12-281-1/+1
| | | |
* | | | Support establishing connection on ActiveRecord::Model.Jon Leighton2011-12-2825-230/+251
| | | | | | | | | | | | | | | | | | | | This is the 'top level' connection, inherited by any models that include ActiveRecord::Model or inherit from ActiveRecord::Base.
* | | | Support configuration on ActiveRecord::Model.Jon Leighton2011-12-2828-222/+498
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem: We need to be able to specify configuration in a way that can be inherited to models that include ActiveRecord::Model. So it is no longer sufficient to put 'top level' config on ActiveRecord::Base, but we do want configuration specified on ActiveRecord::Base and descendants to continue to work. So we need something like class_attribute that can be defined on a module but that is inherited when ActiveRecord::Model is included. The solution: added ActiveModel::Configuration module which provides a config_attribute macro. It's a bit specific hence I am not putting this in Active Support or making it a 'public API' at present.
* | | | Merge pull request #4207 from nashby/deprecate-base64-encode64sAaron Patterson2011-12-286-9/+15
|\ \ \ \ | | | | | | | | | | deprecate Base64.encode64s from AS
| * | | | 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_attribute
| * | | | | 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::Callbacks
| * | | | | Refactor AS::CallbacksBogdan Gusiev2011-12-281-6/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | Extracted `__reset_runner` from `__define_runner` And call it in proper places
* | | | | Merge pull request #4213 from amatsuda/ar_where_array_of_nil_and_a_valueJon Leighton2011-12-281-2/+5
|\ \ \ \ \ | | | | | | | | | | | | AR#where with an Array of 2 elements including a nil
| * | | | | where(foo: [1, nil]) becomes "WHERE foo = 1 OR foo IS NULL"Akira Matsuda2011-12-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | was "WHERE foo IN (1) OR foo IS NULL" before
| * | | | | 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 ↵Jon Leighton2011-12-283-25/+81
|\ \ \ \ | |/ / / |/| | | | | | | | | | | alexeymuranov/my_fix_for_prefix_suffix_fixtures_test Fix a fixtures test case with table prefix/suffix
| * | | Use the correct table name from fixtureAlexey Muranov2011-12-281-2/+2
| | | | | | | | | | | | | | | | Fixed a bug in fixtures.rb where the table name was incorrectly inferred from the fixture path which was ambiguously called "table_name" but was also used as the fixture name. Now, the "correct" table name is taken from an instance variable.
| * | | Fix a fixtures test case with table prefix/suffixAlexey Muranov2011-12-272-23/+79
| | | | | | | | | | | | | | | | Make sure the table name of a model is reset in a test case after assigning ActiveRecord::Base.table_name_prefix and ActiveRecord::Base.table_name_suffix.
* | | | 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.
| * | | | Revert "This conditions is required to work with database create task. 1.9.2 ↵Arun Agrawal2011-12-271-2/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | is having a bug with "Calling return within begin still executes else". " No need to worry about 1.9.2 with master This reverts commit fbf4bee6ed3682b361d6fbeca8e185e665e26b81.
* | | | Merge pull request #4198 from castlerock/remove_GC_checks_for_ruby19Santiago Pastorino2011-12-271-10/+4
|\ \ \ \ | | | | | | | | | | remove conditions for GC::Profiler in ruby19
| * | | | 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 ruby18
| * | | 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 ruby19
| * | | 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 value
| * | | | refactor Range#include? for range valueVasiliy Ermolovich2011-12-261-3/+1
| |/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 23:20:44 +0000