aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Rename Model.arel_table to Model.active_relationPratik Naik2010-01-027-29/+29
|
* Rename Model.engine to active_relation_engine. Cache arel_table and the ↵Pratik Naik2010-01-022-9/+14
| | | | method takes no arguments now
* Use Arel::Table instead of ActiveRecord::Relation from HABTM and ↵Pratik Naik2010-01-012-4/+4
| | | | has_many#delete_records
* Remove unncessary arguments passed to arel_tablePratik Naik2010-01-012-2/+3
|
* Use arel for building the STI type conditionPratik Naik2010-01-011-7/+7
|
* Put MySQL and Postgres in an :only block so you can gem bundle --only ↵Yehuda Katz2009-12-311-2/+5
| | | | default to leave out MySQL and Postgres
* Make rendering in ActionView happen through _render_template, as the ↵José Valim2009-12-311-30/+14
| | | | rendering which comes from ActionController.
* Expose a _render_partial hook as thhe _render_template one and make use of it.José Valim2009-12-313-11/+16
|
* ActionController::Logger should include AbstractController::Logger and sort ↵José Valim2009-12-313-8/+11
| | | | autoloads for easier readability.
* controller_path is required by ActionView, so move it up to ↵José Valim2009-12-317-190/+174
| | | | AbstractController and refactor AbstractController::Layouts.
* Fix new year heisenbugJeremy Kemper2009-12-311-2/+2
|
* Merge commit 'josevalim/inheritance'Jeremy Kemper2009-12-3110-68/+125
|\
| * Simplify repair_validations on AR and make it work with new callbacks.José Valim2010-01-018-49/+32
| |
| * Fix inheritance issue with new callbacks.José Valim2010-01-013-20/+94
| |
* | Merge commit 'mikel/master'Jeremy Kemper2009-12-316-5/+23
|\ \
| * | Updating mail requirement to 1.4.3Mikel Lindsaar2009-12-311-1/+1
| | |
| * | Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2009-12-310-0/+0
| |\ \ | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/tmail_compat.rb
| | * | Adding :transfer_encoding -> :content_transfer_encoding as part of TmailCompatMikel Lindsaar2009-12-305-4/+23
| | | |
| * | | removing spurious lineMikel Lindsaar2009-12-311-1/+0
| | | |
| * | | Adding :transfer_encoding -> :content_transfer_encoding as part of TmailCompatMikel Lindsaar2009-12-315-4/+23
| | | |
* | | | Make sure association proxy does not pass quoted table name to sanitize_sqlPratik Naik2010-01-011-1/+1
| | | |
* | | | Handle Range with excluded endPratik Naik2010-01-011-1/+8
| | | |
* | | | Try using cached attribute before creating a new onePratik Naik2010-01-011-1/+1
| | | |
* | | | Use PredicateBuilder for sql hash sanitizationPratik Naik2010-01-013-26/+14
| | | |
* | | | Fix the method name for recusionPratik Naik2010-01-011-1/+1
| | | |
* | | | Move predicate building to a stand alone PredicateBuilder classPratik Naik2010-01-013-30/+41
| | | |
* | | | Some railties cleanup:Carl Lerche2009-12-3119-109/+116
| | | | | | | | | | | | | | | | | | | | | | | | * Rename <framework>/rails.rb -> <framework>/railtie.rb * Rails::Plugin -> Rails::Railtie * Rails::Plugin::Vendored -> Rails::Plugin
* | | | Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rbCarl Lerche2009-12-3117-135/+140
| | | |
* | | | Use Arel::Attribute when building where conditions from hashPratik Naik2010-01-011-5/+36
| | | |
* | | | Raise a helpful error if config.frameworks is usedCarl Lerche2009-12-312-0/+23
| | | |
* | | | Add a /rails.rb for each framework for consistencyCarl Lerche2009-12-317-4/+18
| | | |
* | | | Fully remove config.frameworks in favor of requires in boot.rbCarl Lerche2009-12-318-38/+24
| | | |
* | | | Use Arel::Attribute for pk conditionsPratik Naik2010-01-011-4/+4
| | | |
* | | | Add Relation#table to get the relevant Arel::TablePratik Naik2010-01-011-1/+10
| | | |
* | | | Add Relation#delete [Pratik Naik, Emilio Tagua]Pratik Naik2010-01-013-4/+8
| |_|/ |/| |
* | | Dont gitkeep things that are gitignoredDavid Heinemeier Hansson2009-12-311-1/+1
|/ /
* | Clarify assertionJeremy Kemper2009-12-301-2/+2
| |
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-3124-559/+341
|\ \
| * | Fix controller runtime testJeremy Kemper2009-12-301-2/+2
| | |
| * | Allow ActiveSupport's isolation tests to run with MiniTest on 1.9Carl Lerche2009-12-302-141/+189
| | |
| * | Revert "Add config.action_controller.include behavior to plugins."Jeremy Kemper2009-12-305-57/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7e8b7f46bfc086a36db996420fbee93348c5268e. Conflicts: railties/lib/rails/plugin.rb
| * | Fix up AR extension by using Railties module instead of Rails and requiring ↵Jeremy Kemper2009-12-304-8/+10
| | | | | | | | | | | | ControllerRuntime at initialization time instead of boot
| * | Remove self-requireJeremy Kemper2009-12-301-2/+1
| | |
| * | Partially revert "ActionDispatch should require as little of ActiveSupport ↵Jeremy Kemper2009-12-301-0/+2
| | | | | | | | | | | | | | | | | | as possible" Removes load path change from commit bb153f42e45160c5ef3593c393db5d3c6857fb70.
| * | depends on Module#attr_internalJeremy Kemper2009-12-301-1/+3
| | |
| * | Merge commit 'josevalim/arlog'Jeremy Kemper2009-12-306-32/+77
| |\ \
| | * | Kick AR logging back to life and move ControllerRuntime inside ↵José Valim2009-12-306-32/+77
| | | | | | | | | | | | | | | | ActiveRecord::Rails.
| * | | Merge branch 'master' of github.com:rails/railsJeremy Kemper2009-12-300-0/+0
| |\ \ \
| | * | | Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally ↵José Valim2009-12-305-289/+9
| | | | | | | | | | | | | | | | | | | | remove it.
| | * | | Setup and teardown now use new callbacks.José Valim2009-12-303-32/+52
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-06 06:23:30 +0000