Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Calculations now use Arel to construct the query. | Emilio Tagua | 2009-04-29 | 9 | -166/+154 |
| | | | | Implemented other methods in AR::Base with Arel support. | ||||
* | construct_finder_sql now use Arel | Emilio Tagua | 2009-04-24 | 6 | -30/+95 |
| | |||||
* | Refactored locking update | Emilio Tagua | 2009-04-24 | 1 | -7/+9 |
| | |||||
* | Merge commit 'rails/master' | Emilio Tagua | 2009-04-24 | 5 | -13/+14 |
|\ | |||||
| * | Use Symbol#to_proc in rails plugin internals | Jeremy Kemper | 2009-04-24 | 1 | -0/+1 |
| | | |||||
| * | Fix models load order to be able to run unit tests. | Emilio Tagua | 2009-04-23 | 4 | -13/+13 |
| | | | | | | | | | | | | [#2550 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Changed locking to use Arel. Arel updated | Emilio Tagua | 2009-04-24 | 2 | -19/+24 |
| | | |||||
* | | Added ruby-debug | Emilio Tagua | 2009-04-24 | 1 | -0/+3 |
| | | |||||
* | | Remove connection method definition, since it's called just once. | Emilio Tagua | 2009-04-23 | 1 | -5/+1 |
| | | |||||
* | | More progress on migrations. Arel updated. | Emilio Tagua | 2009-04-23 | 2 | -6/+7 |
| | | |||||
* | | Added Arel integration to migration's version update table | Emilio Tagua | 2009-04-23 | 1 | -25/+25 |
| | | |||||
* | | Arel updated | Emilio Tagua | 2009-04-23 | 1 | -5/+5 |
| | | |||||
* | | Removed blank lines | Emilio Tagua | 2009-04-23 | 1 | -2/+0 |
| | | |||||
* | | Require Arel | Emilio Tagua | 2009-04-23 | 1 | -0/+5 |
| | | |||||
* | | Added arel as a submodule. This is temporary and will make ↵ | Emilio Tagua | 2009-04-23 | 2 | -0/+9 |
|/ | | | | development/testing easier. | ||||
* | * Add pluggable JSON backends with support for the JSON gem. [rick] | rick | 2009-04-23 | 32 | -239/+384 |
| | | | | | | | | | | | | | | Example: ActiveSupport::JSON.backend = "JSONGem" All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode(). Use of #to_json is not recommended, as it may clash with other libraries that overwrite it. However, you can recover Rails specific functionality if you really want to use #to_json. gem 'json' ActiveSupport::JSON.backend = "JSONGem" class ActiveRecord::Base alias to_json rails_to_json end | ||||
* | Removed rest of Symbol#to_proc from railties tests | Jeremy Kemper | 2009-04-22 | 2 | -3/+3 |
| | |||||
* | Missed one | Jeremy Kemper | 2009-04-22 | 1 | -1/+1 |
| | |||||
* | Remove Symbol#to_proc dependency | Jeremy Kemper | 2009-04-22 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-04-22 | 26 | -114/+165 |
|\ | |||||
| * | Refactor ActionView::Path | Yehuda Katz + Carl Lerche | 2009-04-22 | 26 | -114/+165 |
| | | | | | | | | | | | | | | | | * Decouple from ActionController and ActionMailer * Bring back localization support. * Prepare to decouple templates from the filesystem. * Prepare to decouple localization from ActionView * Fix ActionMailer to take advantage of ActionView::Path | ||||
* | | Fix dependencies revealed by testing in isolation | Jeremy Kemper | 2009-04-22 | 61 | -32/+127 |
| | | |||||
* | | new_callbacks core extensions | Jeremy Kemper | 2009-04-22 | 2 | -5/+8 |
|/ | |||||
* | Fix tests on 1.9 | Jeremy Kemper | 2009-04-22 | 4 | -2/+6 |
| | |||||
* | Merge branch 'master' into cherry | Jeremy Kemper | 2009-04-22 | 5 | -1/+7 |
|\ | | | | | | | | | Conflicts: activesupport/lib/active_support.rb | ||||
| * | Opt in to JSON | Jeremy Kemper | 2009-04-22 | 5 | -1/+7 |
| | | |||||
* | | Opt in to Dependencies | Jeremy Kemper | 2009-04-22 | 10 | -10/+19 |
|/ | |||||
* | No more free lunch | Jeremy Kemper | 2009-04-22 | 14 | -21/+38 |
| | |||||
* | stdlib autoloads were hanging on 1.9.1 | Jeremy Kemper | 2009-04-22 | 3 | -9/+6 |
| | |||||
* | Get Active Model in the mix | Jeremy Kemper | 2009-04-22 | 1 | -1/+1 |
| | |||||
* | Divert CoreExtensions mention in docs | Jeremy Kemper | 2009-04-22 | 1 | -1/+1 |
| | |||||
* | Convert string extension modules to class reopens | Jeremy Kemper | 2009-04-22 | 6 | -291/+247 |
| | |||||
* | ActiveSupport.core_ext bridge util no longer used | Jeremy Kemper | 2009-04-22 | 1 | -10/+0 |
| | |||||
* | Switch last module core extension to class reopen | Jeremy Kemper | 2009-04-22 | 2 | -21/+6 |
| | |||||
* | Merge branch 'master' into cherry | Jeremy Kemper | 2009-04-22 | 6 | -18/+96 |
|\ | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-04-22 | 4 | -16/+80 |
| |\ | |||||
| | * | Fix test_rescue_routing_exceptions when running with rake | Joshua Peek | 2009-04-21 | 1 | -13/+15 |
| | | | |||||
| | * | refactor some coupled rescue tests | Joshua Peek | 2009-04-21 | 1 | -16/+78 |
| | | | |||||
| | * | Session tests belong under dispatch folder | Joshua Peek | 2009-04-21 | 3 | -0/+0 |
| | | | |||||
| * | | Rack::Utils.body_to_s doesn't exist in 1.0 | Jeremy Kemper | 2009-04-22 | 2 | -2/+16 |
| |/ | |||||
* | | Merge branch 'master' into cherry | Jeremy Kemper | 2009-04-21 | 15 | -331/+536 |
|\| | |||||
| * | Reinstate Base#render_to_string. Introduce ↵ | Jeremy Kemper | 2009-04-21 | 3 | -6/+38 |
| | | | | | | | | AbstractController#render_to_string which stringifies render_to_body. | ||||
| * | Add microsecond support for sqlite adapter [#1982 state:resolved] | Alex Pooley | 2009-04-21 | 2 | -1/+11 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Update rails:template task to expand file paths [#2528 state:resolved] | Stephen Celis | 2009-04-21 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix nginx config in ci setup notes [Chad Woolley] [#2290 state:resolved] | Pratik Naik | 2009-04-21 | 1 | -4/+13 |
| | | |||||
| * | Remove excess mocking from polymorphic_url tests [#2330 state:resolved] | Mike Gunderloy | 2009-04-21 | 2 | -293/+394 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Change table to prevent copying indexes on sqlite2 | Pratik Naik | 2009-04-21 | 1 | -5/+5 |
| | | |||||
| * | Specify :group with the table name for it to work on sqlite3 | Pratik Naik | 2009-04-21 | 1 | -1/+1 |
| | | |||||
| * | Fix tests for sqlite3 3.6.xx | Pratik Naik | 2009-04-21 | 1 | -1/+1 |
| | | |||||
| * | Fixed dumping from postgresql columns in index in wrong order. [#2515 ↵ | Max Lapshin | 2009-04-21 | 3 | -15/+25 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Tarmo Tänav <tarmo@itech.ee> |