aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-09-0348-1465/+1533
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_controller/resources.rb
| * Some performance goodness for inheritable attributes.Clemens Kofler2008-09-032-8/+8
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Some performance goodness for routing.Clemens Kofler2008-09-031-3/+3
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * More symbols for send and respond_to?.Clemens Kofler2008-09-031-1/+1
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Use symbols for send and respond_to?.Clemens Kofler2008-09-031-6/+6
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Removed unnecessary Symbol#to_proc from Asset Tag Helper.Clemens Kofler2008-09-031-1/+1
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Don't set Content-Length on 304 responsesJonathan del Strother2008-09-022-1/+7
| | | | | | | | | | | | | | | | | | Commit 8aad8c claimed to do this, but it checks for the 304 status too early, before handle_conditional_get! has overridden it. [#958 state:resolved] Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, ↵Jeremy Kemper2008-08-3118-43/+43
| | | | | | | | | | | | | | | | | | | | but it has since been removed from 1.9. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> Conflicts: actionpack/test/controller/layout_test.rb
| * Add layout functionality to mailers.Pratik Naik2008-08-311-1/+5
| | | | | | | | | | Mailer layouts behaves just like controller layouts, except layout names need to have '_mailer' postfix for them to be automatically picked up.
| * Fixes optimised named routes generating question mark followed by nothing ↵Luke Melia2008-08-312-2/+9
| | | | | | | | | | | | | | when provided an empty hash as the last argument. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#481 state:committed]
| * Moved layout exemption logic into the viewJoshua Peek2008-08-315-121/+63
| |
| * Prefix ActionView::Base private methods with an underscoreJoshua Peek2008-08-315-12/+13
| |
| * Fix AM tests and add tests for rendering loggingPratik Naik2008-08-313-2/+32
| |
| * Add lost log messages about template renderingPratik Naik2008-08-312-1/+3
| |
| * Move layout rendering logic to ActionView::BasePratik Naik2008-08-314-70/+57
| |
| * Move copying ivar logic from ActionController::Base to ActionView::BasePratik Naik2008-08-317-57/+35
| |
| * Allow prototype functions to receive position parameter as a symbol.miloops2008-08-302-1/+3
| | | | | | | | | | | | [#887 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Remove unused use_full_path argumentPratik Naik2008-08-311-5/+5
| |
| * 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
| |
| * 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.
| * 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>
| * 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
| |
| * Deprecate render_component.Pratik Naik2008-08-294-27/+52
| | | | | | | | | | Please install render_component plugin from http://github.com/rails/render_component/tree/master if your application uses this functionality.
| * Fix indentationJeremy Kemper2008-08-281-22/+20
| |
| * 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>
| * Deprecated implicit local assignments when rendering partialsJoshua Peek2008-08-283-4/+14
| |
* | Typo in current_cycle example.Henrik N2008-08-281-1/+1
| |
* | Merge commit 'mainstream/master'Pratik Naik2008-08-2852-480/+984
|\| | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/callbacks.rb activeresource/lib/active_resource/base.rb
| * 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>
| * Add TestUploadFile.content_type= to match Request.UploadedFileTim Haines2008-08-272-1/+6
| | | | | | | | | | | | [#920 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * I18n: removed call to #populate from main library filesMarko Seppae2008-08-271-3/+1
| |
| * Store application and other context specific helper modules in ↵Joshua Peek2008-08-263-21/+17
| | | | | | | | ActionView::Base#helpers
| * defined? has no boundsJoshua Peek2008-08-261-1/+1
| |
| * Require missing libraries and check for defined ActionController constant so ↵Joshua Peek2008-08-266-4/+30
| | | | | | | | ActionView can be used standalone
| * Cache JavaScriptGenerator's helper module set on the templateJoshua Peek2008-08-264-16/+20
| |
| * Harmonize framework require strategy. Don't add self to load path since ↵Jeremy Kemper2008-08-252-10/+16
| | | | | | | | Rails initializer and RubyGems handle it.
| * Performance: Cache modules that extend the view context for JavaScriptGeneratorJoshua Peek2008-08-254-5/+16
| |
| * Include all helpers into ActionView::HelperJoshua Peek2008-08-256-54/+100
| |
| * The view context always responds to controller, check if controller ↵Joshua Peek2008-08-251-1/+1
| | | | | | | | available instead
| * Base path may be nil if template is at the root of the view pathJoshua Peek2008-08-251-1/+1
| |
| * Update translations for pluralization key change from 'many' to 'other'Sven Fuchs2008-08-251-22/+22
| |
| * Merge commit 'rails/master' into i18nSven Fuchs2008-08-252-11/+12
| |\
| | * Update translations for pluralization key change from 'other' to 'many'Jeremy Kemper2008-08-241-11/+11
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-26 05:06:26 +0000