Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Raise ArgumentError when trying to merge relations of different classes | Pratik Naik | 2009-12-28 | 2 | -0/+7 |
| | |||||
* | Relation#readonly(false) should toggle the readonly flag | Pratik Naik | 2009-12-28 | 2 | -5/+10 |
| | |||||
* | Remove unused construct_finder_sql | Pratik Naik | 2009-12-28 | 2 | -18/+14 |
| | |||||
* | Fix a typo in CHANGELOG | Pratik Naik | 2009-12-28 | 1 | -1/+1 |
| | |||||
* | Add Model.lock and relation#lock now that arel has locking | Pratik Naik | 2009-12-28 | 4 | -2/+23 |
| | |||||
* | Added Object#presence that returns the object if it's #present? otherwise ↵ | David Heinemeier Hansson | 2009-12-27 | 3 | -4/+29 |
| | | | | returns nil [DHH/Colin Kelley] | ||||
* | Added default .gitignore (this is just recognizing Git market share, don't ↵ | David Heinemeier Hansson | 2009-12-27 | 3 | -0/+6 |
| | | | | throw a hissy if you use another SCM) [DHH] | ||||
* | Fixes some problems with getting a new app working | Yehuda Katz | 2009-12-27 | 2 | -0/+2 |
| | |||||
* | String#exclude? core extension: inverse of #include? | Jeremy Kemper | 2009-12-27 | 3 | -1/+15 |
| | |||||
* | Ruby 1.9: string is not enumerable, so #exclude? is not available | Jeremy Kemper | 2009-12-27 | 1 | -5/+3 |
| | |||||
* | Typo | Jeremy Kemper | 2009-12-27 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-27 | 2 | -2/+4 |
|\ | |||||
| * | Fix generators tests. | José Valim | 2009-12-27 | 1 | -2/+3 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Use i18n | Jeremy Kemper | 2009-12-27 | 1 | -0/+1 |
| | | |||||
* | | Require the enumberable extension from active support because we use #exclude? | David Heinemeier Hansson | 2009-12-27 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-27 | 34 | -316/+382 |
|\ | |||||
| * | Merge remote branch 'jose/perf' | Yehuda Katz | 2009-12-27 | 28 | -302/+369 |
| |\ | |||||
| | * | Remove ActiveRecord runtime logging from ActionPack and place in ↵ | José Valim | 2009-12-27 | 5 | -5/+21 |
| | | | | | | | | | | | | ActiveRecord, adding it through config.action_controller.include hook. | ||||
| | * | Add config.action_controller.include behavior to plugins. | José Valim | 2009-12-27 | 3 | -1/+53 |
| | | | |||||
| | * | Remove ActionView inline logging to ActiveSupport::Notifications and create ↵ | José Valim | 2009-12-26 | 20 | -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é Valim | 2009-12-26 | 1 | -24/+20 |
| | | | |||||
| | * | Optimize <%= render(@posts) %>. | José Valim | 2009-12-26 | 1 | -4/+14 |
| | | | |||||
| | * | Break instrumentation into several end-points so rendering of partials can ↵ | José Valim | 2009-12-26 | 3 | -30/+42 |
| | | | | | | | | | | | | be optimized. | ||||
| | * | Wrap layout rendering in one method: _render_layout (this should make ↵ | José Valim | 2009-12-26 | 2 | -7/+7 |
| | | | | | | | | | | | | partial instrumentation easier). | ||||
| | * | String#<< should work for any object which responds to :to_str, so enable ↵ | José Valim | 2009-12-26 | 2 | -0/+36 |
| | | | | | | | | | | | | this without the performance hit and make Fixnum safe by default. | ||||
| * | | Add Model.from and association_collection#from finder methods | Pratik Naik | 2009-12-28 | 5 | -11/+9 |
| | | | |||||
| * | | Use relation.from when constructing a relation | Pratik Naik | 2009-12-28 | 2 | -3/+4 |
| | | | |||||
* | | | Fix the i18n dependency problem | David Heinemeier Hansson | 2009-12-27 | 6 | -8/+8 |
|/ / | |||||
* | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-27 | 2 | -24/+58 |
|\ \ | |||||
| * | | Dont delegate relation#find to to_a | Pratik Naik | 2009-12-28 | 1 | -1/+1 |
| | | | |||||
| * | | Use arel#from instead of the current hack | Pratik Naik | 2009-12-28 | 1 | -10/+5 |
| | | | |||||
| * | | Fix relation tests for postgres | Pratik Naik | 2009-12-28 | 1 | -8/+9 |
| | | | |||||
| * | | Handle preloads and eager loads when merging relations | Pratik Naik | 2009-12-28 | 2 | -4/+22 |
| | | | |||||
| * | | Add relation#merge to merge two relations | Pratik Naik | 2009-12-28 | 2 | -5/+25 |
| | | | |||||
| * | | Return a new relation when blank is supplied to relation.joins | Pratik Naik | 2009-12-27 | 1 | -1/+1 |
| | | | |||||
* | | | Added shorthand for match 'products/overview' that expands to match ↵ | David Heinemeier Hansson | 2009-12-27 | 2 | -7/+31 |
|/ / | | | | | | | 'products/overview', :to => 'products#overview', :as => 'products_overview' | ||||
* | | Rewrite AssociationCollection#find using relations | Pratik Naik | 2009-12-27 | 1 | -19/+13 |
| | | |||||
* | | Add relation.destroy_all | Pratik Naik | 2009-12-27 | 4 | -2/+30 |
| | | |||||
* | | Make Model.destroy_all use new finders | Pratik Naik | 2009-12-27 | 2 | -1/+3 |
| | | |||||
* | | Make Model.find(:last) use relations | Pratik Naik | 2009-12-27 | 1 | -42/+5 |
| | | |||||
* | | Add relation.last and relation.reverse_order | Pratik Naik | 2009-12-27 | 2 | -1/+40 |
| | | |||||
* | | Make Model.all just a wrapper for find(:all) | Pratik Naik | 2009-12-27 | 1 | -9/+3 |
| | | |||||
* | | Make Model.find(:first, ..) use relations | Pratik Naik | 2009-12-27 | 1 | -24/+2 |
| | | |||||
* | | Make Model.exists? use relation.exists? | Pratik Naik | 2009-12-27 | 1 | -12/+7 |
| | | |||||
* | | Add relation.exists? | Pratik Naik | 2009-12-27 | 3 | -0/+23 |
| | | |||||
* | | Make Model.find(:all) use relations | Pratik Naik | 2009-12-27 | 1 | -1/+1 |
| | | |||||
* | | Add relation.from as a temporary workaround until arel relation has .from option | Pratik Naik | 2009-12-27 | 2 | -4/+15 |
| | | |||||
* | | Relation should supply :from to find_with_associations | Pratik Naik | 2009-12-27 | 1 | -1/+2 |
| | | |||||
* | | Make Model.find(ids) use relations | Pratik Naik | 2009-12-27 | 1 | -63/+11 |
| | | |||||
* | | Add find(ids) to relations | Pratik Naik | 2009-12-27 | 3 | -2/+91 |
| | |