aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Do not mark the session as loaded if an error happened while doing it.José Valim2010-06-251-2/+1
|
* Calling exists? in the session store, without checking for stale sessions, ↵José Valim2010-06-252-10/+10
| | | | was causing the cookie store to panic because we need to unpack the whole session to get its key. This commit fixes this issue and also caches exists calls for performance improvements.
* Line break in migration template and nicer code indentationŁukasz Strzałkowski2010-06-251-6/+8
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Do not wrap hidden fields with error proc [#4962 state:resolved]Carlos Antonio da Silva2010-06-253-3/+23
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Make sure that Rails doesn't resent session_id cookie over and over again if ↵Prem Sichanugrist2010-06-253-1/+27
| | | | | | | | it's already there [#2485 state:resolved] This apply to only Active Record store and Memcached store, as they both store only the session_id, which will be unchanged, in the cookie. Signed-off-by: José Valim <jose.valim@gmail.com>
* Just reading flash messages should not create a session if one does not ↵José Valim2010-06-253-5/+29
| | | | exist yet.
* Dont reload the environment, just not needed broDavid Heinemeier Hansson2010-06-241-2/+0
|
* adding missing assertion and fixing the testNeeraj Singh2010-06-241-2/+4
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* fixing test by replacing assert with assert_equalNeeraj Singh2010-06-241-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'miloops/fixes'José Valim2010-06-248-48/+18
|\
| * Only yield block if given.Emilio Tagua2010-06-241-2/+2
| |
| * Remove block definitions in finder methods.Emilio Tagua2010-06-241-4/+4
| |
| * Remove block definition from method, is not needed since yield is used inside.Emilio Tagua2010-06-243-3/+3
| |
| * Don't define block, just yield if block is given.Emilio Tagua2010-06-241-7/+7
| |
| * Remove deprecated block usage in composed_of.Emilio Tagua2010-06-242-32/+2
| |
* | Remove the --singeleton option from scaffold generator.Prem Sichanugrist2010-06-249-51/+3
| | | | | | | | | | | | | | | | It turned out to be that scaffold for singeleton resource will always depend on another model, and it's not possible at the moment to make the application tests pass after generate the singeleton scafold. So, it would be better to remove it for now and probably provide another generator, such as singeleton_scaffold, in which also require the depended model name. [#4863 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Your original TIME ZONE value on PostgreSQL is correctly restored now, after ↵Santiago Pastorino2010-06-241-3/+5
| | | | | | | | | | | | | | | | going through options :utc and then going back to :local [#4950 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* | quotes are not necessary hereSantiago Pastorino2010-06-241-2/+2
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | adding middleware test for RAILS_CACHENeeraj Singh2010-06-241-0/+11
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Remove obsolete test case, since we have move Rails::LogSubscriber to ↵Prem Sichanugrist2010-06-241-9/+0
| | | | | | | | | | | | ActiveSupport::LogSubscriber in [6788db824ab732b13493a9d702dd8fb89fa153c8] [#4816 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Avoid deserializing cookies too early, which causes session objects to not ↵José Valim2010-06-243-21/+25
| | | | | | | | be available yet. Unfortunately, could not reproduce this in a test case.
* | AS::Isolation functional on Windows/JRuby.Nick Sieger2010-06-242-10/+11
|/ | | | | | Doesn't make up for the fact that it's slooooooooow, though. Signed-off-by: wycats <wycats@gmail.com>
* Ops, this should be beta4.José Valim2010-06-241-1/+1
|
* Fix namespaced redirects [#4389 state:resolved]Andrew White2010-06-242-1/+15
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix bug where ActiveResource::HttpMock would overwrite Accept/Content-Type ↵Elomar França2010-06-242-2/+85
| | | | | | header to application/xml [#4939 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Move Rails::LogSubscriber to ActiveSupport::LogSubscriber, allowing ↵José Valim2010-06-2434-317/+266
| | | | frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved]
* Add tests for relation count. Fix other tests that were conceptually wrong.Emilio Tagua2010-06-242-2/+6
| | | | | | [#4882 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>