aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* accepts_nested_attributes_for typoAdam Meehan2010-06-291-1/+1
|
* Documentation for Array#sampleThiago Pradi2010-06-281-0/+7
|
* Revert commit 37c44c8e707c Need more research on disable-with and ↵Paco Guzman2010-06-281-4/+0
| | | | data-attributes
* Added disable_with option description to button_to helperPaco Guzman2010-06-281-0/+4
|
* Merge remote branch 'rails/master'Xavier Noria2010-06-28210-2206/+3105
|\
| * Fixed that an ArgumentError is thrown when request.session_options[:id] is ↵Michael Lovitt2010-06-276-36/+113
| | | | | | | | | | | | | | | | read in the following scenario: when the cookie store is used, and the session contains a serialized object of an unloaded class, and no session data accesses have occurred yet. Pushed the stale_session_check responsibility out of the SessionHash and down into the session store, closer to where the deserialization actually occurs. Added some test coverage for this case and others related to deserialization of unloaded types. [#4938] Signed-off-by: José Valim <jose.valim@gmail.com>
| * String#[] doesn't return the byte representation on 1.9.2, we should use ↵Santiago Pastorino2010-06-271-1/+1
| | | | | | | | | | | | getbyte that was already added as a Ruby < 1.9 core_ext Signed-off-by: José Valim <jose.valim@gmail.com>
| * Added getbyte as a core_ext to Ruby < 1.9Santiago Pastorino2010-06-272-0/+12
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fixes #2415 by creating a new instance of the Model when saving attributes ↵George Montana Harkin2010-06-272-21/+26
| | | | | | | | | | | | to that model and the associated attributes already exist. Tests included. [#2415 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Normalize recall params when the route is not a standard route otherwise ↵Andrew White2010-06-272-3/+48
| | | | | | | | | | | | :controller and :action may appear in the generated url [#4326 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * removing useless code. [#4988 state:resolved]Aaron Patterson2010-06-261-15/+4
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Refactor: metaprogramming here it's confusing and make use of tapSantiago Pastorino2010-06-261-64/+73
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Change reference to Test::Unit::AssertionFailedError to the generic ↵David Trasbo2010-06-261-1/+1
| | | | | | | | | | | | ActiveSupport::TestCase::Assertion [#4987 state:commited] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Refactor of column_exists? method and this works with PostgreSQLSantiago Pastorino2010-06-261-12/+6
| |
| * Removes useless flattenSantiago Pastorino2010-06-261-4/+9
| |
| * Add module_eval missing file_name and line_number args [#4712 state:resolved]Evgeniy Dolzhenko2010-06-261-2/+2
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * adding adapter tests, avoiding private apis, fixing code in 1.9 [#4986 ↵Aaron Patterson2010-06-262-3/+63
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Create a little bit less objects in ARel.José Valim2010-06-261-6/+9
| |
| * Load JSON additions (as to_json) on active_support/all.Santiago Pastorino2010-06-261-0/+1
| | | | | | | | | | | | [#4730 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Move constantize from conversions to inflections.Santiago Pastorino2010-06-263-12/+11
| | | | | | | | | | | | | | | | This removes ActiveModel dependency on TZInfo. [#4979 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Make sure ActiveResource::Errors#from_json doesn't pass nil to #from_array ↵David Trasbo2010-06-262-2/+13
| | | | | | | | | | | | [#3650 state:commited] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Small changes to responder:José Valim2010-06-261-5/+13
| | | | | | | | | | | | * resources is always an array; * Lazy retrieve request and formats; * Alias api_location and navigation_location to resource_location, making easier to change its behavior without affecting each other and without a need to reimplement any of the behavior methods.
| * Oops. Make previous commit pass on 1.9.2.José Valim2010-06-261-1/+2
| |
| * Tidy up tests in previous commit since they did not assure an OrderedHash is ↵José Valim2010-06-261-3/+2
| | | | | | | | | | | | returned (the test would pass for an array and would pass by chance for hashes). [#4875 state:resolved]
| * Add OrderedHash#invert to preserve order in ruby 1.8 [#4875]chaitanyav2010-06-262-0/+10
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Support optional static segements as well [#4832 state:resolved]Andrew White2010-06-262-1/+35
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fixed normalize_path in Routing::Mapper to handle optional prefix segments ↵Paul Barry2010-06-262-1/+47
| | | | | | | | | | | | with static and dynamic parts Signed-off-by: José Valim <jose.valim@gmail.com>
| * Work around the fact the JSON gem was overwriting to_json implementation for ↵José Valim2010-06-265-22/+44
| | | | | | | | | | | | | | all Ruby core classes. This is required because the JSON gem is incompatible with Rails behavior and was not allowing ActiveModel::Errors to be serialized. So we need to ensure Rails implementation is the one triggered. [#4890 state:resolved]
| * Move some methods into 1.8.x-only proxy. [#4978 state:resolved]Norman Clarke2010-06-261-40/+39
| | | | | | | | | | | | | | | | These methods had been overridden because they had bugs on 1.9.1. Since Rails now supports only 1.9.2, and these methods now work properly on that version, there's no longer any need to override them. Signed-off-by: José Valim <jose.valim@gmail.com>
| * Don't force pluralization of controller name when defining a resource [#4980 ↵Andrew White2010-06-262-1/+18
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * URL fragments should not have safe characters escaped. Ref: Appendix A, ↵Andrew White2010-06-252-4/+10
| | | | | | | | | | | | | | | | http://tools.ietf.org/rfc/rfc3986.txt [#4762 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * refactoring the postgres adapter index method to avoid inject and use ↵Aaron Patterson2010-06-261-4/+4
| | | | | | | | | | | | values_at. [#4976 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * blocks removed from all the ActiveRelation query_methods, extend method ↵Santiago Pastorino2010-06-263-9/+14
| | | | | | | | | | | | added instead Signed-off-by: José Valim <jose.valim@gmail.com>
| * Merge branch 'tago'José Valim2010-06-264-11/+170
| |\
| | * Add column and index query methods to ActiveRecord::SchemaAndrew White2010-06-264-11/+170
| | | | | | | | | | | | | | | | | | [#4219 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | index dump should not include full text indexes. Thanks Ken Mayer for the ↵Aaron Patterson2010-06-262-8/+7
| | | | | | | | | | | | | | | | | | original patch! [#4949 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | reorder method added to ActiveRelationSantiago Pastorino2010-06-262-0/+14
| | | | | | | | | | | | | | | | | | [#4972 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Test for concatenated orders addedSantiago Pastorino2010-06-262-1/+7
| | | | | | | | | | | | | | | | | | [#4972] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Remove previously defined class method logger to supress warnings in Active ↵rohit2010-06-261-0/+4
| | | | | | | | | | | | | | | | | | Support test suites. [#4618 state:open] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Alias ActiveSupport::OrderedHash#update to ActiveSupport::OrderedHash.merge!Paul Mucur2010-06-252-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that an OrderedHash's keys are set up appropriately when using update. [#4973 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | reorganizing adapter specific tests. [#4974 state:resolved]Aaron Patterson2010-06-2513-3/+6
| |/ | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Order is not guaranteed here, ordering by id of people table makes it workSantiago Pastorino2010-06-251-2/+2
| |
| * Change the generated Gemfile to resolve, via documentation, the issue of ↵wycats2010-06-251-3/+4
| | | | | | | | rspec generators being unavailable in development mode
| * Support for multiple selects addedNeeraj Singh and Santiago Pastorino2010-06-253-7/+18
| | | | | | | | [#4841 state:committed]
| * Makes a build_select for the select part of build_arelSantiago Pastorino2010-06-251-10/+13
| |
| * Metaprogramming not needed hereSantiago Pastorino2010-06-251-11/+9
| |
| * Avoid a blank line before the add/remove columnsSantiago Pastorino2010-06-251-2/+2
| |
| * Failing test for whether glob parameters accept regexpsAndrew White2010-06-251-0/+9
| | | | | | | | | | | | [#4970 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Add failing test case for parameters with periodsAndrew White2010-06-251-0/+27
| | | | | | | | | | | | [#2536 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Depend on unreleased rack-mount 0.6.6.preJeremy Kemper2010-06-251-0/+1
| |