aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typos and formats for CHANGELOGTrung Lê2012-01-041-114/+122
|
* just add the writer rather than adding both and removing oneAaron Patterson2011-12-291-2/+1
|
* stop using __send__ and just module eval in the extensionsAaron Patterson2011-12-291-3/+2
|
* we know the classes will be a list, so *tell* it to respond to eachAaron Patterson2011-12-291-3/+3
| | | | rather than casting
* don't need the begin / endAaron Patterson2011-12-291-21/+17
|
* avoid extra method calls by just defining the delegateAaron Patterson2011-12-291-2/+3
|
* Merge pull request #4226 from grentis/content_for_with_flushJosé Valim2011-12-292-8/+84
|\ | | | | content_for with flush parameter
| * content_for with flush parametergrentis2011-12-292-8/+84
|/
* don't use instance eval, just reference variables so we don't have toAaron Patterson2011-12-291-10/+11
| | | | worry about "inspect" marshalling
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-295-22/+17
|\
| * revise some doc changesVijay Dev2011-12-291-9/+4
| |
| * Documented about using :path option for resourcesKevin Moore2011-12-281-0/+7
| |
| * Fixed formatting of code examples in form_tag_helper.rbAlejandro Andrés2011-12-281-4/+4
| |
| * typoJo Liss2011-12-281-1/+1
| |
| * Document that index names are made up of all columns, not just the first.Jo Liss2011-12-271-9/+2
| | | | | | | | | | | | | | | | | | | | | | index_name has been using the following expression "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}" since at least 2006 (bc7f2315), and that's how they come out in my DB. Please check that this is correct before merging into master, perhaps I'm misunderstanding the section I changed.
| * Remove unnecessary comma.Uģis Ozols2011-12-261-1/+1
| |
* | removing dead code.Aaron Patterson2011-12-291-12/+3
| |
* | decouple initialize from clear!. Initialize ivars in initialize, clearAaron Patterson2011-12-291-5/+5
| | | | | | | | ivars in clear!
* | modules don't have any instance methodsAaron Patterson2011-12-291-3/+1
| |
* | 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
|/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 09:11:03 +0000