aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make this less brittle and work on 1.8Yehuda Katz2009-10-151-9/+9
|
* Kill rake bundleJeremy Kemper2009-10-151-10/+0
|
* Fix AM tests by configuring AVJeremy Kemper2009-10-151-0/+2
|
* AP tests depend on ARJeremy Kemper2009-10-151-0/+1
|
* Make the erubis implementation easier for plugins to change.Michael Koziarski2009-10-151-1/+4
|
* Add a read-only method which plugin authors can use to determine if xss ↵Michael Koziarski2009-10-151-0/+5
| | | | | | | escaping. This doesn't provide a way to turn off the escaping, but alternative template engine authors can figure out what their default should be by calling this. Avoids a messy version + plugin check.
* Don't push siblings on load path if using bundled envJeremy Kemper2009-10-142-7/+16
|
* AV expects options[:locals] to be a HashJeremy Kemper2009-10-141-0/+1
|
* CI bundles Active Record dependencies before running (pulls in Arel)Jeremy Kemper2009-10-141-3/+3
|
* Merge branch 'arel'Jeremy Kemper2009-10-1436-683/+822
|\
| * Clarify AR dependencyJeremy Kemper2009-10-141-6/+10
| |
| * Fix env pathJeremy Kemper2009-10-141-1/+1
| |
| * Include bundled env in toplevel require, if presentJeremy Kemper2009-10-142-11/+10
| |
| * No more toplevel arel siblingJeremy Kemper2009-10-141-4/+2
| |
| * Merge branch 'master' into arelJeremy Kemper2009-10-1439-246/+933
| |\
| * | Move from git submodule to gem bundleJeremy Kemper2009-10-145-9/+14
| | |
| * | Merge commit 'rails/master'Emilio Tagua2009-10-145-31/+15
| |\ \
| * | | Use ActiveSupport::Callbacks instead ofEmilio Tagua2009-10-131-1/+1
| | | | | | | | | | | | | | | | ActiveSupport::DeprecatedCallbacks.
| * | | Merge commit 'rails/master'Emilio Tagua2009-10-1362-4019/+2595
| |\ \ \
| * \ \ \ Merge commit 'rails/master'Emilio Tagua2009-10-0845-58/+450
| |\ \ \ \
| * | | | | Updated ARel commit version.Emilio Tagua2009-10-081-5/+5
| | | | | |
| * | | | | Relations: Added offset when finding with associations. Delegate array instanceEmilio Tagua2009-10-072-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | methods to to_a.
| * | | | | Merge commit 'rails/master'Emilio Tagua2009-10-077-111/+134
| |\ \ \ \ \
| * | | | | | Don't send table_name when updating attributes, use the class arel_table.Emilio Tagua2009-10-071-1/+1
| | | | | | |
| * | | | | | Don't send table_name when there's no need to.Emilio Tagua2009-10-071-1/+1
| | | | | | |
| * | | | | | Allow preload and eager_load to work on relations at the same time.Emilio Tagua2009-10-072-6/+30
| | | | | | |
| * | | | | | Merge commit 'rails/master'Emilio Tagua2009-10-068-1/+79
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-10-0515-809/+64
| |\ \ \ \ \ \ \
| * | | | | | | | Initial documentation to Base#all.Emilio Tagua2009-10-051-2/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'associations_2'Emilio Tagua2009-10-056-13/+90
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Added eager loading support to Relation and ActiveRecord#all.Emilio Tagua2009-10-054-21/+34
| | | | | | | | | |
| | * | | | | | | | Moved relation's test to relation_test.Emilio Tagua2009-10-054-9/+19
| | | | | | | | | |
| | * | | | | | | | Added association preload to relation.Emilio Tagua2009-09-013-4/+58
| | | | | | | | | |
| * | | | | | | | | Merge commit 'rails/master'Emilio Tagua2009-10-0550-395/+396
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-10-033-25/+125
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-10-02414-1485/+1675
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-2222-301/+652
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-2176-708/+498
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Updated ARel version.Emilio Tagua2009-09-141-5/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge commit 'rails/master'Emilio Tagua2009-09-14250-673/+1223
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-0834-558/+490
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-08101-1239/+2115
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-01164-6353/+1140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * | | | | | | | | | | | | | | | | Revert "Revert "Add readonly support for relations.""Emilio Tagua2009-08-273-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f2c0725d79e29b02e30e7a4827851acc4a766730.
| * | | | | | | | | | | | | | | | | Revert "Add readonly support for relations."Emilio Tagua2009-08-273-23/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7cce95b25ace33e04526d4490e487a080c1f9b96.
| * | | | | | | | | | | | | | | | | Add readonly support for relations.Emilio Tagua2009-08-273-2/+23
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | No need to reload the relation table with a method param, just nil it.Emilio Tagua2009-08-271-5/+3
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Performance: Don't reload ARel relation on update.Emilio Tagua2009-08-271-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Performance: Don't reload the ARel relation on create, do it onEmilio Tagua2009-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset_column_information.
| * | | | | | | | | | | | | | | | | Performance: Don't reload the arel_table when destroying.Emilio Tagua2009-08-271-1/+1
| | | | | | | | | | | | | | | | | |