aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove the todo note for arel#lockPratik Naik2009-12-281-1/+0
|
* Add Model.readonly and association_collection#readonly finder methodPratik Naik2009-12-285-19/+25
|
* Remove locking related unused codePratik Naik2009-12-283-26/+0
|
* Raise ArgumentError when trying to merge relations of different classesPratik Naik2009-12-282-0/+7
|
* Relation#readonly(false) should toggle the readonly flagPratik Naik2009-12-282-5/+10
|
* Remove unused construct_finder_sqlPratik Naik2009-12-282-18/+14
|
* Fix a typo in CHANGELOGPratik Naik2009-12-281-1/+1
|
* Add Model.lock and relation#lock now that arel has lockingPratik Naik2009-12-284-2/+23
|
* Added Object#presence that returns the object if it's #present? otherwise ↵David Heinemeier Hansson2009-12-273-4/+29
| | | | returns nil [DHH/Colin Kelley]
* Added default .gitignore (this is just recognizing Git market share, don't ↵David Heinemeier Hansson2009-12-273-0/+6
| | | | throw a hissy if you use another SCM) [DHH]
* Fixes some problems with getting a new app workingYehuda Katz2009-12-272-0/+2
|
* String#exclude? core extension: inverse of #include?Jeremy Kemper2009-12-273-1/+15
|
* Ruby 1.9: string is not enumerable, so #exclude? is not availableJeremy Kemper2009-12-271-5/+3
|
* TypoJeremy Kemper2009-12-271-1/+1
|
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-272-2/+4
|\
| * Fix generators tests.José Valim2009-12-271-2/+3
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Use i18nJeremy Kemper2009-12-271-0/+1
| |
* | Require the enumberable extension from active support because we use #exclude?David Heinemeier Hansson2009-12-271-0/+2
|/
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-2734-316/+382
|\
| * Merge remote branch 'jose/perf'Yehuda Katz2009-12-2728-302/+369
| |\
| | * Remove ActiveRecord runtime logging from ActionPack and place in ↵José Valim2009-12-275-5/+21
| | | | | | | | | | | | ActiveRecord, adding it through config.action_controller.include hook.
| | * Add config.action_controller.include behavior to plugins.José Valim2009-12-273-1/+53
| | |
| | * Remove ActionView inline logging to ActiveSupport::Notifications and create ↵José Valim2009-12-2620-252/+197
| | | | | | | | | | | | ActionController::Base#log_event, so everything can be logged within one listener. Also expose log_process_action as a hook for different modules to include their own information during the action processing. This allow ActiveRecord to hook and any other ORM. Finally, this commit changes 'Processing' and 'Rendering' in logs to 'Processed' and 'Rendered' because at the point it's logged, everying already happened.
| | * More <%= render(@posts) %> optimization.José Valim2009-12-261-24/+20
| | |
| | * Optimize <%= render(@posts) %>.José Valim2009-12-261-4/+14
| | |
| | * Break instrumentation into several end-points so rendering of partials can ↵José Valim2009-12-263-30/+42
| | | | | | | | | | | | be optimized.
| | * Wrap layout rendering in one method: _render_layout (this should make ↵José Valim2009-12-262-7/+7
| | | | | | | | | | | | partial instrumentation easier).
| | * String#<< should work for any object which responds to :to_str, so enable ↵José Valim2009-12-262-0/+36
| | | | | | | | | | | | this without the performance hit and make Fixnum safe by default.
| * | Add Model.from and association_collection#from finder methodsPratik Naik2009-12-285-11/+9
| | |
| * | Use relation.from when constructing a relationPratik Naik2009-12-282-3/+4
| | |
* | | Fix the i18n dependency problemDavid Heinemeier Hansson2009-12-276-8/+8
|/ /
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-272-24/+58
|\ \
| * | Dont delegate relation#find to to_aPratik Naik2009-12-281-1/+1
| | |
| * | Use arel#from instead of the current hackPratik Naik2009-12-281-10/+5
| | |
| * | Fix relation tests for postgresPratik Naik2009-12-281-8/+9
| | |
| * | Handle preloads and eager loads when merging relationsPratik Naik2009-12-282-4/+22
| | |
| * | Add relation#merge to merge two relationsPratik Naik2009-12-282-5/+25
| | |
| * | Return a new relation when blank is supplied to relation.joinsPratik Naik2009-12-271-1/+1
| | |
* | | Added shorthand for match 'products/overview' that expands to match ↵David Heinemeier Hansson2009-12-272-7/+31
|/ / | | | | | | 'products/overview', :to => 'products#overview', :as => 'products_overview'
* | Rewrite AssociationCollection#find using relationsPratik Naik2009-12-271-19/+13
| |
* | Add relation.destroy_allPratik Naik2009-12-274-2/+30
| |
* | Make Model.destroy_all use new findersPratik Naik2009-12-272-1/+3
| |
* | Make Model.find(:last) use relationsPratik Naik2009-12-271-42/+5
| |
* | Add relation.last and relation.reverse_orderPratik Naik2009-12-272-1/+40
| |
* | Make Model.all just a wrapper for find(:all)Pratik Naik2009-12-271-9/+3
| |
* | Make Model.find(:first, ..) use relationsPratik Naik2009-12-271-24/+2
| |
* | Make Model.exists? use relation.exists?Pratik Naik2009-12-271-12/+7
| |
* | Add relation.exists?Pratik Naik2009-12-273-0/+23
| |
* | Make Model.find(:all) use relationsPratik Naik2009-12-271-1/+1
| |
* | Add relation.from as a temporary workaround until arel relation has .from optionPratik Naik2009-12-272-4/+15
| |