Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed unused methods. | Emilio Tagua | 2009-08-07 | 1 | -70/+56 |
| | |||||
* | Removed useless OR. | Emilio Tagua | 2009-08-07 | 1 | -1/+1 |
| | |||||
* | Don't scope order in calculations.' | Emilio Tagua | 2009-08-07 | 1 | -1/+1 |
| | |||||
* | Merge commit 'rails/master' | Emilio Tagua | 2009-08-07 | 53 | -406/+241 |
|\ | |||||
| * | Get all ActionController partial rendering to use ActionView's partial code. ↵ | Yehuda Katz | 2009-08-07 | 4 | -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. | ||||
| * | Whitespace | Yehuda Katz | 2009-08-07 | 1 | -7/+7 |
| | | |||||
| * | Continue reworking the partial path. | Yehuda Katz | 2009-08-07 | 2 | -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 Katz | 2009-08-07 | 3 | -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 Katz | 2009-08-07 | 2 | -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 Katz | 2009-08-07 | 7 | -21/+29 |
| | | | | | | | | is optional | ||||
| * | Some more AV refactoring: | Yehuda Katz | 2009-08-07 | 2 | -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 path | Yehuda Katz | 2009-08-07 | 4 | -12/+20 |
| | | |||||
| * | This is handled by the resolver now | Yehuda Katz | 2009-08-07 | 1 | -24/+5 |
| | | |||||
| * | Clean up render @object a bit more. | Yehuda Katz | 2009-08-07 | 3 | -78/+19 |
| | | |||||
| * | Improve a path in _render_partial | Yehuda Katz | 2009-08-06 | 2 | -24/+27 |
| | | |||||
| * | Remove file that doesn't seem to be used anymore | Yehuda Katz | 2009-08-06 | 1 | -84/+0 |
| | | |||||
| * | Move AbstractController to a top-level component | Yehuda Katz | 2009-08-06 | 14 | -22/+19 |
| | | |||||
| * | ActionController::Metal#to_rack converted to #to_a to match normal rack ↵ | Yehuda Katz | 2009-08-06 | 2 | -3/+3 |
| | | | | | | | | convention | ||||
| * | Update _render_options to reflect the fact that they're public | Yehuda Katz | 2009-08-06 | 1 | -6/+6 |
| | | |||||
| * | Rename /base to /metal and make base.rb and metal.rb top-level to reflect ↵ | Yehuda Katz | 2009-08-06 | 26 | -36/+36 |
| | | | | | | | | their module locations | ||||
| * | rename ActionController::Http to ActionController::Metal at Josh's suggestion | Yehuda Katz | 2009-08-06 | 6 | -12/+10 |
| | | |||||
| * | Replace _action_view with view_context to reflect that it is public and that ↵ | Yehuda Katz | 2009-08-06 | 6 | -11/+10 |
| | | | | | | | | it does not need to be an ActionView instance | ||||
| * | replace _render_*_from_controller with render_* as they are intended to be ↵ | Yehuda Katz | 2009-08-06 | 5 | -9/+9 |
| | | | | | | | | public | ||||
* | | More work on removing plain SQL from associations and use ARel instead. | Emilio Tagua | 2009-08-07 | 3 | -35/+43 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-06 | 4 | -13/+5 |
|\| | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-08-05 | 2 | -4/+4 |
| |\ | |||||
| | * | Use send instead of instance_eval | Pratik Naik | 2009-08-06 | 2 | -4/+4 |
| | | | |||||
| * | | Ruby 1.9.2 compat: Array#* uses to_str instead of to_s to join values since ↵ | Akira Matsuda | 2009-08-05 | 1 | -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 upstream | James Tucker | 2009-08-05 | 1 | -7/+0 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-05 | 31 | -254/+706 |
|\| | |||||
| * | Allow validations to use values from custom readers [#2936 state:resolved] | James Hill | 2009-08-05 | 5 | -4/+71 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Make sure javascript_include_tag/stylesheet_link_tag does not append ".js" ↵ | Matthew Rudy Jacobs | 2009-08-05 | 3 | -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 Buesing | 2009-08-05 | 3 | -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 AMo | Joshua Peek | 2009-08-04 | 9 | -299/+284 |
| | | |||||
| * | whitespace | Joshua Peek | 2009-08-04 | 1 | -5/+5 |
| | | |||||
| * | Added reset_attribute! method to ActiveRecord::AttributeMethods::Dirty which ↵ | Paul Gillard | 2009-08-04 | 2 | -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 Gillard | 2009-08-04 | 5 | -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 ActiveRecord | Joshua Peek | 2009-08-04 | 9 | -29/+122 |
| | | |||||
| * | fallback_string_to_date sets Date._parse comp arg to true, so that strings ↵ | Matt Ganderup | 2009-08-03 | 3 | -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 Buesing | 2009-08-03 | 4 | -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] | ||||
* | | Added collection iteration to AR::Relation. | Emilio Tagua | 2009-08-03 | 2 | -1/+4 |
| | | |||||
* | | Don't use local vars before testing its conditional. | Emilio Tagua | 2009-08-03 | 2 | -8/+6 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-03 | 19 | -117/+92 |
|\| | |||||
| * | Track generated attribute methods in a separate module | Joshua Peek | 2009-08-02 | 4 | -35/+19 |
| | | |||||
| * | Remove legacy processing and content_length | Yehuda Katz | 2009-08-02 | 4 | -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 Katz | 2009-08-02 | 7 | -30/+29 |
| | | | | | | | | * Significantly simplifies setting and modifying cache control in other areas | ||||
| * | Ruby 1.9: fix encoding for test_file_stream | Jeremy Kemper | 2009-08-01 | 1 | -1/+2 |
| | | |||||
| * | Ruby 1.9: fix Content-Length for multibyte send_data streaming | Sava Chankov | 2009-08-01 | 3 | -1/+17 |
| | | | | | | | | | | | | [#2661 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Extract String#bytesize shim | Jeremy Kemper | 2009-08-01 | 3 | -3/+14 |
| | | |||||
| * | SQLite: drop support for 'dbfile' option in favor of 'database.' | Jeremy Kemper | 2009-08-01 | 2 | -1/+2 |
| | |