aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Calculations now use Arel to construct the query.Emilio Tagua2009-04-299-166/+154
* construct_finder_sql now use ArelEmilio Tagua2009-04-246-30/+95
* Refactored locking updateEmilio Tagua2009-04-241-7/+9
* Merge commit 'rails/master'Emilio Tagua2009-04-245-13/+14
|\
| * Use Symbol#to_proc in rails plugin internalsJeremy Kemper2009-04-241-0/+1
| * Fix models load order to be able to run unit tests.Emilio Tagua2009-04-234-13/+13
* | Changed locking to use Arel. Arel updatedEmilio Tagua2009-04-242-19/+24
* | Added ruby-debugEmilio Tagua2009-04-241-0/+3
* | Remove connection method definition, since it's called just once.Emilio Tagua2009-04-231-5/+1
* | More progress on migrations. Arel updated.Emilio Tagua2009-04-232-6/+7
* | Added Arel integration to migration's version update tableEmilio Tagua2009-04-231-25/+25
* | Arel updatedEmilio Tagua2009-04-231-5/+5
* | Removed blank linesEmilio Tagua2009-04-231-2/+0
* | Require ArelEmilio Tagua2009-04-231-0/+5
* | Added arel as a submodule. This is temporary and will make development/testin...Emilio Tagua2009-04-232-0/+9
|/
* * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-2332-239/+384
* Removed rest of Symbol#to_proc from railties testsJeremy Kemper2009-04-222-3/+3
* Missed oneJeremy Kemper2009-04-221-1/+1
* Remove Symbol#to_proc dependencyJeremy Kemper2009-04-221-2/+2
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-2226-114/+165
|\
| * Refactor ActionView::PathYehuda Katz + Carl Lerche2009-04-2226-114/+165
* | Fix dependencies revealed by testing in isolationJeremy Kemper2009-04-2261-32/+127
* | new_callbacks core extensionsJeremy Kemper2009-04-222-5/+8
|/
* Fix tests on 1.9Jeremy Kemper2009-04-224-2/+6
* Merge branch 'master' into cherryJeremy Kemper2009-04-225-1/+7
|\
| * Opt in to JSONJeremy Kemper2009-04-225-1/+7
* | Opt in to DependenciesJeremy Kemper2009-04-2210-10/+19
|/
* No more free lunchJeremy Kemper2009-04-2214-21/+38
* stdlib autoloads were hanging on 1.9.1Jeremy Kemper2009-04-223-9/+6
* Get Active Model in the mixJeremy Kemper2009-04-221-1/+1
* Divert CoreExtensions mention in docsJeremy Kemper2009-04-221-1/+1
* Convert string extension modules to class reopensJeremy Kemper2009-04-226-291/+247
* ActiveSupport.core_ext bridge util no longer usedJeremy Kemper2009-04-221-10/+0
* Switch last module core extension to class reopenJeremy Kemper2009-04-222-21/+6
* Merge branch 'master' into cherryJeremy Kemper2009-04-226-18/+96
|\
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-224-16/+80
| |\
| | * Fix test_rescue_routing_exceptions when running with rakeJoshua Peek2009-04-211-13/+15
| | * refactor some coupled rescue testsJoshua Peek2009-04-211-16/+78
| | * Session tests belong under dispatch folderJoshua Peek2009-04-213-0/+0
| * | Rack::Utils.body_to_s doesn't exist in 1.0Jeremy Kemper2009-04-222-2/+16
| |/
* | Merge branch 'master' into cherryJeremy Kemper2009-04-2115-331/+536
|\|
| * Reinstate Base#render_to_string. Introduce AbstractController#render_to_strin...Jeremy Kemper2009-04-213-6/+38
| * Add microsecond support for sqlite adapter [#1982 state:resolved]Alex Pooley2009-04-212-1/+11
| * Update rails:template task to expand file paths [#2528 state:resolved]Stephen Celis2009-04-211-1/+3
| * Fix nginx config in ci setup notes [Chad Woolley] [#2290 state:resolved]Pratik Naik2009-04-211-4/+13
| * Remove excess mocking from polymorphic_url tests [#2330 state:resolved]Mike Gunderloy2009-04-212-293/+394
| * Change table to prevent copying indexes on sqlite2Pratik Naik2009-04-211-5/+5
| * Specify :group with the table name for it to work on sqlite3Pratik Naik2009-04-211-1/+1
| * Fix tests for sqlite3 3.6.xxPratik Naik2009-04-211-1/+1
| * Fixed dumping from postgresql columns in index in wrong order. [#2515 state:r...Max Lapshin2009-04-213-15/+25