aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/rails into oldJosé Valim2009-08-074-14/+23
|\
| * Get all ActionController partial rendering to use ActionView's partial code. ↵Yehuda Katz2009-08-074-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Consequences: * It is not possible to always pre-determine the layout before going to ActionView. This was *already* broken for render :partial => @object, :layout => true. This is now handled by overriding render_to_body in layouts.rb and manually injecting the partial's response. This needs to be done in ActionController since ActionController knows enough to get _layout_for_option. There is probably a better abstraction here. * As a result, all partial rendering can correctly restrict their layouts to the mime type of the rendered partial. This could have previously caused a bug in some edge cases. * If other layout-like options are added, they might need to add special code for the case of render :partial. We should try to think of an alternate solution, if possible, but this works for the cases we know of now.
* | Merge branch 'master' of git://github.com/rails/rails into oldJosé Valim2009-08-0796-756/+1001
|\|
| * WhitespaceYehuda Katz2009-08-071-7/+7
| |
| * Continue reworking the partial path.Yehuda Katz2009-08-072-47/+22
| | | | | | | | * TODO: Review ActionController calling render_template for certain partials. Might we be able to save logic by always delegating to AV's render_partial?
| * Modify various partial methods to carry along the block that can be passed ↵Yehuda Katz2009-08-073-44/+54
| | | | | | | | | | | | | | | | | | | | in with render * _render_single_template, which renders a template without layout * _render_partial_unknown_type, which renders a partial of unknown type (the entry method for most partial rendering; supports strings, objects, and collections) * _render_partial_object, which renders a partial for a single object. * extracted _render_partial_path so it can be used to render the spacer without going through the public render :partial
| * Some more AV work:Yehuda Katz2009-08-072-26/+25
| | | | | | | | | | | | | | | | * rename _render_partial to _render_partial_unknown_type to reflect that for this call, we don't know the type. * Merge _render_partial_with_block and _render_partial_with_layout to _render_partial * TODO: Check to see if any more logic can be shared * TODO: See about streamlining block path so we can get rid of @_proc_for_layout * Remove @exempt_from_layout as it is no longer needed
| * Replace _render_template_with_layout with _render_template since the layout ↵Yehuda Katz2009-08-077-21/+29
| | | | | | | | is optional
| * Some more AV refactoring:Yehuda Katz2009-08-072-15/+6
| | | | | | | | | | * remove no longer used _array_like_objects * _render_content_with_layout renamed to _render_content since layout it optional * remove check for optional layout before _render_content
| * Start cleaning up partial pathYehuda Katz2009-08-074-12/+20
| |
| * This is handled by the resolver nowYehuda Katz2009-08-071-24/+5
| |
| * Clean up render @object a bit more.Yehuda Katz2009-08-073-78/+19
| |
| * Improve a path in _render_partialYehuda Katz2009-08-062-24/+27
| |
| * Remove file that doesn't seem to be used anymoreYehuda Katz2009-08-061-84/+0
| |
| * Move AbstractController to a top-level componentYehuda Katz2009-08-0614-22/+19
| |
| * ActionController::Metal#to_rack converted to #to_a to match normal rack ↵Yehuda Katz2009-08-062-3/+3
| | | | | | | | convention
| * Update _render_options to reflect the fact that they're publicYehuda Katz2009-08-061-6/+6
| |
| * Rename /base to /metal and make base.rb and metal.rb top-level to reflect ↵Yehuda Katz2009-08-0626-36/+36
| | | | | | | | their module locations
| * rename ActionController::Http to ActionController::Metal at Josh's suggestionYehuda Katz2009-08-066-12/+10
| |
| * Replace _action_view with view_context to reflect that it is public and that ↵Yehuda Katz2009-08-066-11/+10
| | | | | | | | it does not need to be an ActionView instance
| * replace _render_*_from_controller with render_* as they are intended to be ↵Yehuda Katz2009-08-065-9/+9
| | | | | | | | public
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-08-052-4/+4
| |\
| | * Use send instead of instance_evalPratik Naik2009-08-062-4/+4
| | |
| * | Ruby 1.9.2 compat: Array#* uses to_str instead of to_s to join values since ↵Akira Matsuda2009-08-051-2/+1
| |/ | | | | | | | | | | | | | | Ruby 1.9.2 [#2959 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Dont require thin as the thin rack adapter is now upstreamJames Tucker2009-08-051-7/+0
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Allow validations to use values from custom readers [#2936 state:resolved]James Hill2009-08-055-4/+71
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Make sure javascript_include_tag/stylesheet_link_tag does not append ".js" ↵Matthew Rudy Jacobs2009-08-053-12/+22
| | | | | | | | | | | | or ".css" onto external urls [#1664 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Revert "fallback_string_to_date sets Date._parse comp arg to true, so that ↵Geoff Buesing2009-08-053-9/+1
| | | | | | | | | | | | strings with two-digit years, e.g. '1/1/09', are interpreted as modern years" [#2019 state:wontfix] This reverts commit 55d1d12c32a1b99f3f07d2346b49a63650ba2e9d.
| * Extract generic attribute method generation to AMoJoshua Peek2009-08-049-299/+284
| |
| * whitespaceJoshua Peek2009-08-041-5/+5
| |
| * Added reset_attribute! method to ActiveRecord::AttributeMethods::Dirty which ↵Paul Gillard2009-08-042-12/+39
| | | | | | | | | | | | will reset an attribute to its original value should it have changed. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Modified ActiveRecord::AttributeMethods to allow classes to specify ↵Paul Gillard2009-08-045-56/+200
| | | | | | | | | | | | attribute method prefixes and/or suffixes. Previously only suffixes were allowed. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Add simple support for ActiveModel's StateMachine for ActiveRecordJoshua Peek2009-08-049-29/+122
| |
| * fallback_string_to_date sets Date._parse comp arg to true, so that strings ↵Matt Ganderup2009-08-033-1/+9
| | | | | | | | with two-digit years, e.g. '1/1/09', are interpreted as modern years [#2019 state:resolved]
| * quoted_date converts time-like objects to ↵Geoff Buesing2009-08-034-1/+127
| | | | | | | | ActiveRecord::Base.default_timezone before serialization. This allows you to use Time.now in find conditions and have it correctly be serialized as the current time in UTC when default_timezone == :utc [#2946 state:resolved]
| * Track generated attribute methods in a separate moduleJoshua Peek2009-08-024-35/+19
| |
| * Remove legacy processing and content_lengthYehuda Katz2009-08-024-49/+12
| | | | | | | | | | | | | | | | | | | | | | * convert_content_type! is handled by assign_default_content_type_and_charset! * set_content_length! should be handled by the endpoint server. Otherwise each middleware that modifies the body has to do the expensive work of recalculating content_length. * convert_language! appears to be legacy. There are no tests for this * convert_cookies! should be handled by the new HeaderHash in Rack * Use an integer for .status's internal representation to avoid needing to do String manipulation just to find out the status
| * Update cache_control to be a Hash of options that is used to build the header.Yehuda Katz2009-08-027-30/+29
| | | | | | | | * Significantly simplifies setting and modifying cache control in other areas
| * Ruby 1.9: fix encoding for test_file_streamJeremy Kemper2009-08-011-1/+2
| |
| * Ruby 1.9: fix Content-Length for multibyte send_data streamingSava Chankov2009-08-013-1/+17
| | | | | | | | | | | | [#2661 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Extract String#bytesize shimJeremy Kemper2009-08-013-3/+14
| |
| * SQLite: drop support for 'dbfile' option in favor of 'database.'Jeremy Kemper2009-08-012-1/+2
| |
* | Merge branch 'respond_with'José Valim2009-07-312-58/+187
|\ \ | |/ |/|
| * Added tests for nested resources.José Valim2009-07-311-12/+48
| |
| * Allow respond_with to deal with http verb accordingly.José Valim2009-07-312-40/+136
| |
| * Remove any resource logic from respond_to.José Valim2009-07-301-17/+14
| |
* | Start separating primary key concernsJoshua Peek2009-07-304-65/+76
| |
* | Make sure we use send for the default attribute method body because the ↵Joshua Peek2009-07-301-1/+1
| | | | | | | | suffix maybe an invalid method name
* | Make sure to reset defined methods after calling attribute_method_suffixJoshua Peek2009-07-301-9/+7
| |
* | Move attribute_types_cached_by_default into attribute methods reading concernJoshua Peek2009-07-302-10/+11
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 18:31:25 +0000