Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into i18n-merge | Jeremy Kemper | 2008-07-17 | 29 | -119/+237 |
|\ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb activerecord/lib/active_record/validations.rb | ||||
| * | All 2xx requests are considered successful [#217 state:resolved] | Joshua Peek | 2008-07-16 | 1 | -1/+1 |
| | | |||||
| * | Use fully-qualified controller name when logging. [#600 state:resolved] | Ripta Pasay | 2008-07-17 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Resolved conflict | David Heinemeier Hansson | 2008-07-16 | 54 | -1365/+1318 |
| |\ | |||||
| | * | Allow Dispatcher exceptions to be handled in application.rb using rescue_from | Pratik Naik | 2008-07-16 | 1 | -12/+16 |
| | | | |||||
| | * | Fixed template recompile logic [#630 state:resolved] | Stefan Kaes | 2008-07-16 | 1 | -22/+31 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | Merge with docrails. | Pratik Naik | 2008-07-16 | 24 | -52/+149 |
| | | | |||||
| | * | Make RackRequest#request_method respect _method | Pratik Naik | 2008-07-16 | 1 | -4/+0 |
| | | | |||||
| | * | Removed config.action_view.cache_template_loading, use config.cache_classes ↵ | Joshua Peek | 2008-07-15 | 3 | -8/+17 |
| | | | | | | | | | | | | instead | ||||
| | * | RackResponse should not contain Status header | Pratik Naik | 2008-07-16 | 1 | -1/+1 |
| | | | |||||
| | * | RackRequest#content_type should return Mime::Type | Pratik Naik | 2008-07-16 | 1 | -1/+1 |
| | | | |||||
| | * | JavaScriptGenerator should only sets output_buffer for the duration of the ↵ | Jeremy Kemper | 2008-07-15 | 2 | -10/+12 |
| | | | | | | | | | | | | update block | ||||
| * | | Fixed that AssetTagHelper#compute_public_path shouldn't cache the asset_host ↵ | David Heinemeier Hansson | 2008-07-16 | 1 | -11/+14 |
| | | | | | | | | | | | | along with the source or per-request proc's won't run [DHH] | ||||
* | | | moving country helpers from form_options_helper to form_country_helper again | Sven Fuchs | 2008-07-16 | 2 | -81/+14 |
| | | | |||||
* | | | fixing another timezone dependent test | Sven Fuchs | 2008-07-16 | 1 | -1/+1 |
| | | | |||||
* | | | merge forward to current rails/master | Sven Fuchs | 2008-07-16 | 49 | -1428/+1360 |
|\ \ \ | | |/ | |/| | |||||
| * | | Get buffer for fragment cache from template's @output_buffer | Joshua Peek | 2008-07-15 | 7 | -218/+191 |
| | | | |||||
| * | | Ruby 1.9 compat: only eval with block.binding in 1.9, uses more memory than ↵ | Jeremy Kemper | 2008-07-15 | 1 | -6/+12 |
| | | | | | | | | | | | | eval with block | ||||
| * | | Ruby 1.9 compat: call Proc#binding explicitly. [#623 state:resolved] | 松田 明 | 2008-07-15 | 1 | -1/+1 |
| | | | |||||
| * | | memorize typo | Joshua Peek | 2008-07-14 | 3 | -10/+10 |
| | | | |||||
| * | | Include Memoizable in ActionView::Template | Joshua Peek | 2008-07-14 | 3 | -43/+27 |
| | | | |||||
| * | | Use sub instead of gsub | Tarmo Tänav | 2008-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | | Eager load Partial variable_name and counter_name. Tidy up ↵ | Joshua Peek | 2008-07-14 | 4 | -45/+49 |
| | | | | | | | | | | | | render_partial_collection. | ||||
| * | | Move dead recompile_template? also | Jeremy Kemper | 2008-07-14 | 2 | -17/+2 |
| | | | |||||
| * | | Remove dead code from merge | Jeremy Kemper | 2008-07-14 | 1 | -30/+0 |
| | | | |||||
| * | | Fix bad merge | Jeremy Kemper | 2008-07-14 | 1 | -2/+2 |
| | | | |||||
| * | | Use instance_method(...) to check whether the method exists | Jeremy Kemper | 2008-07-14 | 1 | -2/+44 |
| | | | |||||
| * | | Restore the more readable before_ and after_filters methods since they ↵ | Jeremy Kemper | 2008-07-14 | 1 | -10/+2 |
| | | | | | | | | | | | | aren't called frequently | ||||
| * | | Ensure :index works with fields_for select methods. [#518 state:resolved] | rsl | 2008-07-14 | 1 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | Check first render format and extension. Fixes failing ActionMailer test. | Joshua Peek | 2008-07-13 | 1 | -1/+1 |
| | | | |||||
| * | | Small tweak to e0fef66 | Joshua Peek | 2008-07-13 | 1 | -3/+3 |
| | | | |||||
| * | | Made ActionView::Base#first_render a little more private. And added ↵ | Joshua Peek | 2008-07-13 | 5 | -20/+12 |
| | | | | | | | | | | | | _last_render to track the most recent render. Will fix #609 as a side effect. [#609 state:resolved] | ||||
| * | | Set config.action_view.warn_cache_misses = true to receive a warning if you ↵ | Joshua Peek | 2008-07-12 | 3 | -5/+34 |
| | | | | | | | | | | | | perform an action that results in an expensive disk operation that could be cached | ||||
| * | | Refactor template preloading. New abstractions include Renderable mixins and ↵ | Joshua Peek | 2008-07-12 | 17 | -465/+351 |
| | | | | | | | | | | | | a refactored Template class. | ||||
| * | | Restore support for partial matches in assert_redirected_to | Michael Koziarski | 2008-07-12 | 1 | -2/+9 |
| | | | | | | | | | | | | If both the actual redirection and the asserted redirection are hashes, succeed if the asserted redirection is a strict subset of the actual redirection. | ||||
| * | | Ensure mail_to label is obfuscated for javascript encoding. [#294 ↵ | Johan Sørensen | 2008-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | Changed ActionView::TemplateHandler#render API method signature to ↵ | Joshua Peek | 2008-07-11 | 4 | -6/+6 |
| | | | | | | | | | | | | render(template, local_assigns = {}) | ||||
| * | | Whitespace | Michael Koziarski | 2008-07-11 | 1 | -2/+1 |
| | | | |||||
| * | | Check for response in builder template since ActionMailer does not have one | Joshua Peek | 2008-07-11 | 1 | -1/+2 |
| | | | |||||
| * | | Added notes to Routing documentation and routes.rb regarding defaults routes ↵ | Clemens Kofler | 2008-07-10 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | opening the whole application for GET requests Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | | Move accept header parsing shortcut to Mime::Type.parse | Jeremy Kemper | 2008-07-09 | 2 | -41/+43 |
| | | | |||||
| * | | Don't repeatedly convert only/except options | Jeremy Kemper | 2008-07-09 | 1 | -3/+28 |
| | | | |||||
| * | | Remove some Symbol#to_proc usage in runtime code. [#484 state:resolved] | Cheah Chu Yeow | 2008-07-09 | 2 | -10/+18 |
| | | | |||||
| * | | Request#accepts special-cases a single mime type | Jeremy Kemper | 2008-07-09 | 1 | -4/+10 |
| | | | |||||
| * | | Put a newline rather than a semicolon at the end of RJS source to avoid ↵ | Jeremy Kemper | 2008-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | parse errors with embedded heredocs | ||||
| * | | Use ActionController::Base.logger to report template compilation errors ↵ | Jeremy Kemper | 2008-07-09 | 1 | -4/+4 |
| | | | | | | | | | | | | since there is no AV::Base.logger | ||||
| * | | Rendering default template for missing actions works with non-word ↵ | Jeremy Kemper | 2008-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | characters in action name | ||||
| * | | Pass caller to concat deprecation warning | Jeremy Kemper | 2008-07-09 | 1 | -1/+1 |
| | | | |||||
| * | | Reenable the use of the Accept header to give people a chance to update ↵ | Michael Koziarski | 2008-07-09 | 1 | -3/+3 |
| | | | | | | | | | | | | their applications and provide feedback. | ||||
| * | | Changed PrototypeHelper#submit_to_remote to PrototypeHelper#button_to_remote ↵ | David Heinemeier Hansson | 2008-07-09 | 1 | -3/+6 |
| | | | | | | | | | | | | to stay consistent with link_to_remote (submit_to_remote still works as an alias) (clemens) [#8994 status:closed] |