aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused use_full_path argumentPratik Naik2008-08-311-5/+5
|
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-08-303-2/+15
|\
| * Add test to make sure RJS block inside controller is executed in view contextPratik Naik2008-08-301-0/+13
| |
| * Dont pass controller partial layout option to viewPratik Naik2008-08-302-2/+2
| |
* | Performance: Better query for ASSOCIATION_ids. Select only ids if the ↵miloops2008-08-304-17/+73
|/ | | | | | association hasn't been loaded. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Remove double layout checkPratik Naik2008-08-301-6/+1
|
* Add support for shallow nesting of routes. [#838 state:resolved]Pratik Naik2008-08-303-37/+184
| | | | | | | | | | | | | | | | | | Adds :shallow option to resource route definition. If true, paths for nested resources which reference a specific member (ie. those with an :id parameter) will not use the parent path prefix or name prefix. Example : map.resources :users, :shallow => true do |user| user.resources :posts end * GET /users/1/posts (maps to PostsController#index action as usual) named route "user_posts" is added as usual. * GET /posts/2 (maps to PostsController#show action as if it were not nested) Additionally, named route "post" is added too.
* I18n: applied Luca Guidi's patch for better #interpolate performanceSven Fuchs2008-08-301-17/+20
| | | | | | [#943 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Added optional rake doc:app TITLE environment parameterNathaniel Bibler2008-08-291-2/+2
| | | | | | [#939 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Format related patches to support serializing data out in the correct format ↵Rasik Pandey2008-08-299-50/+78
| | | | | | | with correct http request headers per http method type [#450 state:resolved] Signed-off-by: Tarmo Tänav <tarmo@itech.ee> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Make assert_select_rjs code more readable, make use of unused constants and ↵miloops2008-08-292-52/+31
| | | | | | | | use more simple Regexps. [#540 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Added button_to_remote helperTarmo Tänav2008-08-293-0/+23
| | | | | | Ticket originally from http://dev.rubyonrails.org/ticket/3641 Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix test to not assume which thread finishes firstJeremy Kemper2008-08-291-1/+2
|
* Move some core extension methods into a module under the ↵Hongli Lai (Phusion)2008-08-294-148/+165
| | | | | | | | ActiveSupport::CoreExtensions namespace, instead of extending core classes directly. This is more friendly for API reference generators. [#915 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Make NamedScope#size behave identically to AssociationCollection#size. [#933 ↵Tom Stuart2008-08-292-1/+20
| | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* 1.9: methods need to be coerced into stringsJoshua Peek2008-08-291-1/+1
|
* ActionMailer should respond_to? to methods handled by method_missing [#700 ↵James Mead2008-08-292-5/+68
| | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Use a set for the named scope methods not a big regexp.Michael Koziarski2008-08-291-2/+2
|
* Ensure that calling content_tag_for in a helper doesn't cause duplicate output.Tom Lea2008-08-292-3/+11
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#871 state:committed]
* Improve assert_select_rjs failure messages for show, hide, toggle, and removeTim Haines2008-08-292-1/+51
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#931 state:committed]
* Merge RenderTest and NewRenderTestJoshua Peek2008-08-292-1010/+822
|
* Make case insensitive validates_uniqueness_of use unicode aware downcase method.Eugene Pimenov2008-08-292-1/+13
| | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Make query-cache thread-localNick Sieger2008-08-291-14/+29
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fix parentheses warningsMichael Koziarski2008-08-291-1/+1
|
* Fix NamedScope regex so methods containing "an" get delegated to ↵Jan De Poorter2008-08-292-1/+5
| | | | | | proxy_found. [#901 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Deprecate render_component.Pratik Naik2008-08-295-28/+53
| | | | | Please install render_component plugin from http://github.com/rails/render_component/tree/master if your application uses this functionality.
* Date#freeze bug doesn't affect Ruby 1.9Jeremy Kemper2008-08-281-7/+11
|
* Date#freeze bug doesn't affect Ruby 1.9Jeremy Kemper2008-08-281-8/+17
|
* Fix indentationJeremy Kemper2008-08-281-22/+20
|
* Missed changelog update for #501Jeremy Kemper2008-08-281-0/+2
|
* Routes may be restricted to lists of HTTP methods instead of a single method ↵Brennan Dunn2008-08-284-6/+37
| | | | | | | | or :any. [#407 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Accept an array of method symbols for collection/member actions of resourcesBrennan Dunn2008-08-282-8/+26
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Merge scoped :joins together instead of overwriting them. May expose scoping ↵Andrew White2008-08-284-15/+109
| | | | | | | | bugs in your code! [#501 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Refactored AssociationCollection#count for uniformity and Ruby 1.8.7 support.Ernie Miller2008-08-286-36/+49
| | | | | | [#831 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-08-285-5/+33
|\
| * Deprecated implicit local assignments when rendering partialsJoshua Peek2008-08-284-4/+30
| |
| * Prevent deprecation warning in the testsMichael Koziarski2008-08-281-1/+3
| |
* | Reinstate Range#step default argument.Bradford Folkens2008-08-271-2/+2
|/ | | | | | [#595 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Implement count limit/offset support for has_many associationsTarmo Tänav2008-08-272-1/+16
| | | | | | [#348 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Alias included associations if needed when doing a countTarmo Tänav2008-08-272-2/+12
| | | | | | [#302 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Dirty: treat two changes resulting in the original value as being unchanged.Tom Lea2008-08-272-1/+40
| | | | | | [#798 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Added TextHelper#current_cycle to return the current cycle for better design ↵Ken Collins2008-08-273-3/+76
| | | | | | | | options. [#417 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Request#remote_ip handles the uncommon case that REMOTE_ADDR is a ↵Michael S. Klishin2008-08-272-3/+8
| | | | | | | | comma-separated list. [#523 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* PostgreSQL: fix quote_string for certain old pg drivers. [#94 state:resolved]Lars Kanis2008-08-271-1/+1
|
* respond_to? passes along splat args to avoid introducing the second arg if ↵Jeremy Kemper2008-08-271-2/+2
| | | | it was omitted
* Add TestUploadFile.content_type= to match Request.UploadedFileTim Haines2008-08-272-1/+6
| | | | | | [#920 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Merge commit 'sven/i18n'Jeremy Kemper2008-08-276-41/+14
|\ | | | | | | | | Conflicts: activesupport/lib/active_support.rb
| * I18n: remove #populate from Simple backend as wellMarko Seppae2008-08-271-7/+0
| |
| * i18n: fixed failing tests after removing #populate and #store_translationsMarko Seppae2008-08-271-12/+7
| |
| * I18n: removed call to #populate from main library filesMarko Seppae2008-08-273-9/+3
| |