Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor to calculations. Migration's versions are string not integer. ARel ↵ | Emilio Tagua | 2009-05-06 | 4 | -29/+28 |
| | | | | submodule updated. | ||||
* | Merge branch 'master' of git://github.com/rails/rails | Emilio Tagua | 2009-05-06 | 12 | -102/+105 |
|\ | |||||
| * | Cherry pick Active Support dependencies. Autoload. | Jeremy Kemper | 2009-05-06 | 11 | -81/+100 |
| | | |||||
| * | Remove superfluous CGI require | Jeremy Kemper | 2009-05-05 | 1 | -1/+0 |
| | | |||||
| * | Prefer sibling Active Support | Jeremy Kemper | 2009-05-05 | 1 | -9/+3 |
| | | |||||
| * | Cherry-pick the inflector only | Jeremy Kemper | 2009-05-05 | 1 | -11/+2 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-05 | 21 | -22/+423 |
|\| | |||||
| * | assert_redirect_to's partial hash matching was deprecated in 2-3 stable ↵ | Joshua Peek | 2009-05-04 | 1 | -7/+0 |
| | | | | | | | | 7f1f16c01 | ||||
| * | fix problems with requires in metal choking under development reloading ↵ | Tim Connor | 2009-05-04 | 1 | -1/+2 |
| | | | | | | | | | | | | [#2579 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Fix console | Joshua Peek | 2009-05-04 | 1 | -2/+3 |
| | | |||||
| * | Providing support for :inverse_of as an option to associations. | Murray Steele | 2009-05-04 | 18 | -12/+418 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now add an :inverse_of option to has_one, has_many and belongs_to associations. This is best described with an example: class Man < ActiveRecord::Base has_one :face, :inverse_of => :man end class Face < ActiveRecord::Base belongs_to :man, :inverse_of => :face end m = Man.first f = m.face Without :inverse_of m and f.man would be different instances of the same object (f.man being pulled from the database again). With these new :inverse_of options m and f.man are the same in memory instance. Currently :inverse_of supports has_one and has_many (but not the :through variants) associations. It also supplies inverse support for belongs_to associations where the inverse is a has_one and it's not a polymorphic. Signed-off-by: Murray Steele <muz@h-lame.com> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Fixes to have all test passing on PostgreSQL. | Emilio Tagua | 2009-05-04 | 3 | -22/+33 |
| | | | | | | | | | | | | Calculations now use construct_calculation_arel, making construct_finder_arel less hackish. Updated ARel to support PostgreSQL. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-04 | 48 | -703/+570 |
|\| | |||||
| * | Fixed Hash#from_xml with keys that are all caps. | codebrulee | 2009-05-04 | 2 | -1/+17 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-04 | 30 | -592/+422 |
| |\ | |||||
| | * | Wrap dispatcher callbacks around the whole middleware chain. Kill ↵ | Joshua Peek | 2009-05-03 | 3 | -38/+22 |
| | | | | | | | | | | | | unnecessary Reloader middleware. | ||||
| | * | Show lazy middleware args in pretty print | Joshua Peek | 2009-05-03 | 1 | -2/+1 |
| | | | |||||
| | * | Extract ActionController rescue templates into Rescue and ShowExceptions ↵ | Joshua Peek | 2009-05-02 | 28 | -556/+403 |
| | | | | | | | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public. | ||||
| * | | Don't use #tap before Active Support is available, since older versions of ↵ | Chris Kampmeier | 2009-05-04 | 1 | -3/+2 |
| |/ | | | | | | | | | | | | | | | ruby don't have native implementations [#2603 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix implicit ordering expectation | Jeremy Kemper | 2009-05-02 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-02 | 21 | -105/+132 |
| |\ | |||||
| | * | Deprecate Controller.process interface | Joshua Peek | 2009-05-02 | 3 | -10/+13 |
| | | | |||||
| | * | Switch functional tests to run through the rack interface instead of process | Joshua Peek | 2009-05-02 | 7 | -10/+28 |
| | | | |||||
| | * | Functional test runner finalizes response just like the integration test ↵ | Joshua Peek | 2009-05-02 | 9 | -58/+66 |
| | | | | | | | | | | | | | | | runner. In both runners, the @response object will now behave the same. Some functional tests will need to be updated if they are relying on preprocessed data on the response. | ||||
| | * | Deprecate assert_redirect_to's partial hash matching | Joshua Peek | 2009-05-02 | 8 | -28/+26 |
| | | | |||||
| * | | Check for sibling Active Support first | Jeremy Kemper | 2009-05-02 | 1 | -8/+3 |
| |/ | |||||
* | | Revert "Work around count returning string (bug)" | Emilio Tagua | 2009-05-02 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 4bb6f77059a34ea7c8575523397032b4cc67e00a. | ||||
* | | Refactor to use arel_table method, and also use the same method name for ↵ | Emilio Tagua | 2009-05-02 | 3 | -21/+18 |
| | | | | | | | | instance and class methods. | ||||
* | | Removed ARel table assignment | Emilio Tagua | 2009-05-02 | 1 | -1/+0 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-02 | 94 | -830/+6118 |
|\| | |||||
| * | Added routing test for irregular ID requirements and custom member action. | Ruy Asan | 2009-05-01 | 1 | -0/+8 |
| | | | | | | | | | | | | [#2595 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fixed bug with polymorphic has_one :as pointing to an STI record | Ruy Asan | 2009-05-01 | 6 | -5/+21 |
| | | | | | | | | | | | | [#2594 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Default scope :order should be overridden by named scopes. | Alexander Podgorbunsky | 2009-05-01 | 2 | -5/+5 |
| | | | | | | | | | | | | [#2346 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Rename vendor/rack to vendor/rack-1.1.pre | Pratik Naik | 2009-05-01 | 52 | -2/+2 |
| | | |||||
| * | Vendor Rack edge ( commit : 815342a8e15db564b766f209ffb1e340233f064f ) | Pratik Naik | 2009-05-01 | 52 | -1/+5418 |
| | | |||||
| * | Tests should use ActiveRecord::Base.connection.rollback_db_transaction to ↵ | steve | 2009-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | rollback a transaction Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure ActiveRecord::Base.connection_pool.with_connection creates a new ↵ | steve | 2009-05-01 | 2 | -5/+35 |
| | | | | | | | | | | | | connection only when needed [#1752 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Use table_exists? in #initialize_schema_migrations_table [#1923 state:resolved] | Ken Collins | 2009-05-01 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Update some old tests to use AC TestProcess | Joshua Peek | 2009-04-30 | 1 | -12/+13 |
| | | |||||
| * | alias method chain process with test | Joshua Peek | 2009-04-30 | 2 | -5/+8 |
| | | |||||
| * | Move TestRequest#query_parameters into AD TestRequest | Joshua Peek | 2009-04-30 | 3 | -13/+7 |
| | | |||||
| * | Selectively require rake sshpublisher so full gem isn't required | Jeremy Kemper | 2009-04-30 | 1 | -1/+2 |
| | | |||||
| * | Explicitly require builder for to_xml | Jeremy Kemper | 2009-04-30 | 1 | -0/+2 |
| | | |||||
| * | Set rack.input instead of RAW_POST_DATA in TestRequest | Joshua Peek | 2009-04-30 | 1 | -28/+11 |
| | | |||||
| * | Missed stray @request_uri | Joshua Peek | 2009-04-30 | 1 | -2/+0 |
| | | |||||
| * | Move TestRequest cookies accessor into AD TestRequest | Joshua Peek | 2009-04-30 | 3 | -5/+36 |
| | | |||||
| * | Depend on unreleased rack 1.1 | Joshua Peek | 2009-04-30 | 5 | -334/+2 |
| | | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-04-30 | 2 | -1/+12 |
| |\ | |||||
| | * | Fix render :json => nil [#2589 state:resolved] | Jeremy Kemper | 2009-04-30 | 2 | -1/+12 |
| | | | |||||
| * | | Fix action-cached exception responses. | John F. Douthat | 2009-04-30 | 2 | -1/+44 |
| |/ | | | | | | | | | | | | | | | Methods raising ActiveRecord::RecordNotFound were returning 404 on first request and 200 OK with blank body on subsequent requests. [#2533 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |