Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11443 from wangjohn/sse_reloader_class | Santiago Pastorino | 2013-08-19 | 1 | -0/+74 |
|\ | | | | | SSE class for ActionController::Live | ||||
| * | Creating an SSE class to be used with ActionController::Live. | wangjohn | 2013-07-30 | 1 | -0/+74 |
| | | |||||
* | | Fail informatively in #respond_with when no appropriate #api_behavior ↵ | Ben Woosley | 2013-08-17 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | renderer is available. Currently if a user calls #respond_with(csvable), but has not csv renderer available, Responder will just run through the default render behavior twice, raising ActionView::MissingTemplate both times. This changes ActionController::Metal::Responder#api_behavior to check in advance whether there is a renderer available, and raise ActionController::MissingRenderer if not. | ||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-08-17 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md | ||||
| * | | Revert "Merge branch 'master' of github.com:rails/docrails" | Vijay Dev | 2013-08-17 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake. | ||||
* | | Added data for permit array into scalar value | Rahul P. Chaudhari | 2013-08-05 | 1 | -0/+1 |
| | | |||||
* | | fix a gramatical mistake | Rajeev N Bharshetty | 2013-08-02 | 1 | -1/+1 |
| | | |||||
* | | Improve documentation for controller how to get included helpers [ci skip] | Paul Nikitochkin | 2013-07-30 | 1 | -1/+1 |
|/ | | | | Closes #11671 | ||||
* | Typo fix | Ankit Gupta | 2013-07-25 | 1 | -1/+1 |
| | | | | | [skip ci] Fixing the typo which is formed a not required link. Check here http://api.rubyonrails.org/classes/ActionController/Base.html under paramters section keeping it under tt tag | ||||
* | Removed random dot in code sample [ci skip] | Max Vasiliev | 2013-07-22 | 1 | -1/+1 |
| | |||||
* | Add documentation for add_flash_types [ci skip] | Robin Dupret | 2013-07-10 | 1 | -0/+17 |
| | | | | | Document a little bit the ActionController::Flash::add_flash_types class method. | ||||
* | Remove `page_cache_extension` deprecated method | Francesco Rodriguez | 2013-07-01 | 1 | -10/+0 |
| | |||||
* | Remove deprecated constants from Action Controller | Carlos Antonio da Silva | 2013-07-01 | 2 | -12/+0 |
| | | | | | | | | | | ActionController::AbstractRequest => ActionDispatch::Request ActionController::Request => ActionDispatch::Request ActionController::AbstractResponse => ActionDispatch::Response ActionController::Response => ActionDispatch::Response ActionController::Routing => ActionDispatch::Routing ActionController::Integration => ActionDispatch::Integration ActionController::IntegrationTest => ActionDispatch::IntegrationTest | ||||
* | Re-remove deprecated API. | kennyj | 2013-06-28 | 1 | -12/+0 |
| | |||||
* | Remove duplicate letter 'a'. [ci skip] | Uģis Ozols | 2013-06-19 | 1 | -1/+1 |
| | |||||
* | Add `respond_with` `location` option to the docs | Tute Costa | 2013-06-18 | 1 | -2/+6 |
| | |||||
* | Remove ActionController::RecordIdentifier was deprecated. | kennyj | 2013-06-01 | 2 | -32/+0 |
| | |||||
* | Remove action_controller/vendor/html-scanner.rb was deprecated. | kennyj | 2013-06-01 | 1 | -5/+0 |
| | |||||
* | Revert "Add the options method to action_controller testcase." | Rafael Mendonça França | 2013-05-16 | 1 | -6/+0 |
| | | | | | | | | | | | | This reverts commit 0303c2325fab253adf5e4a0b738cb469c048f008. Conflicts: actionpack/lib/action_controller/test_case.rb REASON: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638. | ||||
* | inspect the filter when displaying error messages | Aaron Patterson | 2013-05-14 | 1 | -1/+1 |
| | |||||
* | [ci skip] document protect_against_forgery? method | Weston Platter | 2013-05-10 | 1 | -0/+1 |
| | |||||
* | use canonical #controller_path logic in controller test cases | Lance Ivy | 2013-05-05 | 1 | -1/+1 |
| | |||||
* | Fix generating route from engine to other engine | Piotr Sarnacki | 2013-05-03 | 1 | -1/+2 |
| | | | | | | | | | | | | A regression was introduced in 5b3bb6, generating route from within an engine to an another engine resulted in prefixing a path with the SCRIPT_NAME value. The regression was caused by the fact that SCRIPT_NAME should be appended only if it's the SCRIPT_NAME for the application, not if it's SCRIPT_NAME from the current engine. closes #10409 | ||||
* | Don't reprocess the options hash on every request | Andrew White | 2013-04-27 | 1 | -1/+2 |
| | |||||
* | Add support for extra options to `force_ssl` | Andrew White | 2013-04-25 | 1 | -17/+48 |
| | | | | | | | | This commit adds support for passing additional url options along with a :status option and any of the flash-related options to `redirect_to` (i.e. :flash, :alert & :notice). Closes #7570. | ||||
* | Use `request.fullpath` to build redirect url in `force_ssl` | Andrew White | 2013-04-25 | 1 | -4/+7 |
| | | | | | | | | | | | The `force_ssl` command now builds the redirect url from `request.fullpath`. This ensures that the format is maintained and it doesn't redirect to a route that has the same parameters but is defined earlier in `routes.rb`. Also any optional segments are maintained. Fixes #7528. Fixes #9061. Fixes #10305. | ||||
* | fixed missing comma in example | Ilya Vorontsov | 2013-04-24 | 1 | -1/+1 |
| | |||||
* | applies documentation guidelines | Xavier Noria | 2013-04-22 | 1 | -11/+12 |
| | |||||
* | Increase readability of ternary statement in build method | buddhamagnet | 2013-04-20 | 1 | -2/+1 |
| | |||||
* | replace match with get verb in ActionController::Metal | Gaurish Sharma | 2013-04-16 | 1 | -1/+1 |
| | |||||
* | Return nil for Mime::NullType#ref | Andrew White | 2013-04-10 | 1 | -1/+1 |
| | |||||
* | Reverts rendering behavior when format is unknown | Grzegorz Świrski | 2013-04-10 | 1 | -1/+1 |
| | | | | | | | | | If a request has unknown format (eg. /foo.bar), the renderer fallbacks to default format. This patch reverts Rails 3.2 behavior after c2267db commit. Fixes issue #9654. | ||||
* | Fix typo | Rafael Mendonça França | 2013-04-09 | 1 | -2/+2 |
| | |||||
* | fix AP warning; remove unused variable | Vipul A M | 2013-04-09 | 1 | -0/+1 |
| | |||||
* | Merge pull request #9604 from sgrif/live_streaming_exceptions | Rafael Mendonça França | 2013-04-08 | 1 | -0/+28 |
|\ | | | | | Exceptions raised when using ActionController::Live cause server crash | ||||
| * | Exception handling for controllers using ActionController::Live | Sean Griffin | 2013-03-18 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | Any exceptions that occured at the view or controller level for a controller using ActionController::Live would cause the server to either hang with an open socket indefinitely, or immediately crash (depending on whether the server was launched with rails s or directly). Changed the behavior of exceptions to act the same as streaming templates for html requests, and allow for an on_error callback if needed. | ||||
* | | Merge pull request #10130 from Agis-/patch-2 | Carlos Antonio da Silva | 2013-04-08 | 1 | -3/+3 |
|\ \ | | | | | | | Mark unused block parameters. | ||||
| * | | Remove unused block parameters | Agis Anastasopoulos | 2013-04-07 | 1 | -3/+3 |
| | | | |||||
* | | | Remove unecessary variable call, `#sort!` always returns an array | Agis Anastasopoulos | 2013-04-07 | 1 | -1/+0 |
|/ / | |||||
* | | Prefer find_by over dynamic finders in rdoc | Sam Ruby | 2013-04-02 | 2 | -3/+3 |
| | | |||||
* | | Fix some typos | Vipul A M | 2013-03-24 | 1 | -1/+1 |
| | | |||||
* | | Fix documentation markup [ci skip] | Rafael Mendonça França | 2013-03-23 | 1 | -0/+2 |
| | | |||||
* | | StringIO is not required by default in JRuby | Arun Agrawal | 2013-03-22 | 1 | -0/+1 |
| | | |||||
* | | Fix broken ActionController#action_missing | Janko Luin | 2013-03-20 | 1 | -1/+1 |
| | | | | | | | | | | A recent change introduced the assumption that all controller actions are known beforehand, which is not true when using action_missing. | ||||
* | | Digest auth should not 500 when given a basic header. | Brad Dunbar | 2013-03-18 | 1 | -0/+1 |
|/ | |||||
* | Fix typos and improve docs a bit [ci skip] | Carlos Antonio da Silva | 2013-03-15 | 1 | -7/+5 |
| | |||||
* | document request simulation methods in functional tests. | Yves Senn | 2013-03-15 | 1 | -7/+27 |
| | |||||
* | Handle conditional get in live requests - this will prevent error when using ↵ | Bernard Potocki | 2013-03-14 | 1 | -0/+4 |
| | | | | stale on live streams(issue #9636) | ||||
* | Skip fetching path if the iteration is going to be skipped | Carlos Antonio da Silva | 2013-03-11 | 1 | -2/+2 |
| | |||||
* | Merge pull request #9626 from dasch/dasch/instrument-strong-params | José Valim | 2013-03-09 | 2 | -1/+7 |
|\ | | | | | Use AS::Notifications to instrument Strong Params |