Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-10-06 | 1 | -4/+0 |
|\ | |||||
| * | `render :text => proc { ... }` is no longer supported. | John Firebaugh | 2010-10-04 | 1 | -4/+0 |
| | | |||||
* | | Provide a cleaner syntax for paths configuration that does not rely on ↵ | José Valim | 2010-10-06 | 2 | -6/+8 |
| | | | | | | | | method_missing. | ||||
* | | Solve some warnings and a failing test. | José Valim | 2010-10-03 | 1 | -0/+1 |
| | | |||||
* | | Rely on Rack::Session stores API for more compatibility across the Ruby world. | José Valim | 2010-10-03 | 1 | -3/+5 |
| | | |||||
* | | no need of nil check | Neeraj Singh | 2010-09-30 | 1 | -1/+1 |
| | | |||||
* | | reduce function calls on Array | Aaron Patterson | 2010-09-29 | 1 | -3/+2 |
| | | |||||
* | | removing more lolinject | Aaron Patterson | 2010-09-29 | 1 | -8/+7 |
| | | |||||
* | | removing lollerject | Aaron Patterson | 2010-09-29 | 1 | -1/+1 |
|/ | |||||
* | Merge remote branch 'miloops/warnings' | José Valim | 2010-09-29 | 1 | -3/+5 |
|\ | |||||
| * | Remove more warnings: no need to define attr_accessor if already exists. ↵ | Emilio Tagua | 2010-09-28 | 1 | -3/+5 |
| | | | | | | | | Initialize ivar. | ||||
| * | Move uri parser to AS as URI.parser method to reuse it in AP and ARes. | Emilio Tagua | 2010-09-27 | 3 | -19/+2 |
| | | |||||
* | | Move uri parser to AS as URI.parser method to reuse it in AP and ARes. | Emilio Tagua | 2010-09-28 | 3 | -19/+2 |
| | | |||||
* | | Fix tests on 1.9.2. | José Valim | 2010-09-28 | 1 | -0/+1 |
| | | |||||
* | | renderer calls object.to_json when rendering :json => object [#5655 ↵ | Diego Carrion | 2010-09-27 | 1 | -1/+1 |
|/ | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Remove more warnings shadowing outer local variable. | Emilio Tagua | 2010-09-27 | 2 | -6/+6 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Remove warning "URI.unescape is obsolete" from actionpack. | Emilio Tagua | 2010-09-27 | 4 | -9/+13 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Do not cache the script name outcome. | José Valim | 2010-09-27 | 1 | -9/+11 |
| | |||||
* | Merge remote branch 'miloops/warnings' | José Valim | 2010-09-27 | 6 | -11/+25 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/url_for.rb | ||||
| * | Initialize @_routes if not defined yet, avoiding more warnings. | Emilio Tagua | 2010-09-27 | 1 | -0/+1 |
| | | |||||
| * | Avoid uninitialized variable warning. | Emilio Tagua | 2010-09-27 | 1 | -1/+1 |
| | | |||||
| * | Initialize @_request and @_response. | Emilio Tagua | 2010-09-27 | 1 | -1/+3 |
| | | |||||
| * | Remove more warnings shadowing outer local variable. | Emilio Tagua | 2010-09-27 | 2 | -6/+6 |
| | | |||||
| * | Remove warning "URI.unescape is obsolete" from actionpack. | Emilio Tagua | 2010-09-27 | 3 | -3/+15 |
| | | |||||
* | | Call it compile_methods! and do the same on AM. | José Valim | 2010-09-27 | 1 | -2/+2 |
| | | |||||
* | | Cache url_options on a per-request basis. | thedarkone | 2010-09-27 | 1 | -9/+11 |
| | | |||||
* | | Compile ActionController::Base.config's methods to avoid method_missing ↵ | thedarkone | 2010-09-27 | 1 | -0/+10 |
|/ | | | | overhead. | ||||
* | Partial revert of #d650b71 'Remove deprecated stuff in ActionController' | Carlos Antonio da Silva | 2010-09-26 | 3 | -0/+6 |
| | | | | | This brings back the deprecated modules from ActionController, because they didn't have any deprecation warning. | ||||
* | Remove deprecated stuff in ActionController | Carlos Antonio da Silva | 2010-09-26 | 5 | -8/+2 |
| | | | | | | This removes all deprecated classes in ActionController related to Routing, Abstract Request/Response and Integration/IntegrationTest. All tests and docs were changed to ActionDispatch instead of ActionController. | ||||
* | Fix logging when cache key contains % sign [#5570 state:resolved] | Krekoten' Marjan | 2010-09-25 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | There is no need to use instance_eval since the proc is created in the same ↵ | José Valim | 2010-09-24 | 1 | -1/+1 |
| | | | | context it is eval'ed. | ||||
* | Make redirect_to accept blocks [#5643 state:resolved] | Nando Vieira | 2010-09-24 | 1 | -1/+5 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | resolves rdoc conflict | Xavier Noria | 2010-09-23 | 1 | -2/+2 |
|\ | |||||
| * | updated instructions on how to change the default session store | Diego Carrion | 2010-09-18 | 1 | -2/+2 |
| | | |||||
| * | updated instructions to generate the migration for the ActiveRecord session ↵ | Diego Carrion | 2010-09-18 | 1 | -1/+1 |
| | | | | | | | | store table | ||||
* | | Refactor decode_credentials to avoid inject and use map instead. | Emilio Tagua | 2010-09-22 | 1 | -6/+5 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | Refactor methods in html node to avoid injects. | Emilio Tagua | 2010-09-22 | 1 | -8/+4 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | Fix header capitalization by explicitly upcasing first letter of every word, ↵ | Maxim Chernyak | 2010-09-18 | 1 | -1/+1 |
| | | | | | | | | and avoiding capitalize. [#5636 state:resolved] | ||||
* | | Small tweak the ConditionalGet documentation | Carl Lerche | 2010-09-17 | 1 | -2/+2 |
|/ | | | Time#utc does not need to be called when passing the object to :last_modified since it is called internally to Rails. | ||||
* | added block arguments to ActionController::Metal#use | Collin Miller | 2010-09-12 | 1 | -3/+3 |
| | | | | | | | | | | | Useful for cases such as warden, where a block configuration is taken. class SomeController < ApplicationController use RailsWarden::Manager do |manager| manager.default_strategies :facebook_oauth manager.failure_app = SomeController.action(:authorize) end end | ||||
* | revises implementation and documentation of csrf_meta_tags, and aliases ↵ | Xavier Noria | 2010-09-11 | 1 | -2/+2 |
| | | | | csrf_meta_tag to it for backwards compatibilty | ||||
* | Merge remote branch 'drogus/engines' | wycats | 2010-09-11 | 1 | -1/+1 |
|\ | |||||
| * | Do not require passing :app to mounted helpers, it's actually useless and ↵ | Piotr Sarnacki | 2010-09-08 | 1 | -1/+1 |
| | | | | | | | | not DRY | ||||
* | | Adding linkage to redirect_to from Base and adding status code option reference | Mikel Lindsaar | 2010-09-09 | 2 | -2/+6 |
|/ | |||||
* | Cleanup deprecation warnings in Action Controller | Carlos Antonio da Silva | 2010-09-06 | 4 | -64/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Forgot to move that line to railtie on rebase | Piotr Sarnacki | 2010-09-03 | 1 | -1/+1 |
| | |||||
* | Include all helpers from non-namespaced engines | Piotr Sarnacki | 2010-09-03 | 1 | -9/+3 |
| | |||||
* | Set only helpers_path on inherited hook in action_controller/railtie.rb and ↵ | Piotr Sarnacki | 2010-09-03 | 3 | -9/+11 |
| | | | | use helper(:all) just after that | ||||
* | Moved ActionMailer and ActionController railties options to inherited hook | Piotr Sarnacki | 2010-09-03 | 3 | -16/+32 |
| | | | | | | | | | | | This change is needed, because we must take namespace into account and if controller's/mailer's class is namespaced, engine's paths should be set instead of application's ones. The nice side effect of this is removing unneeded logic in ActionController::Base.inherited - now the helpers_path should be set correctly even for engine's controllers, so helper(:all) will always include correct helpers. | ||||
* | Refactor ActionMailer to not use hide_actions | Piotr Sarnacki | 2010-09-03 | 1 | -14/+1 |
| |