aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* Don't reprocess the options hash on every requestAndrew White2013-04-271-1/+2
|
* Add support for extra options to `force_ssl`Andrew White2013-04-251-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 White2013-04-251-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 exampleIlya Vorontsov2013-04-241-1/+1
|
* applies documentation guidelinesXavier Noria2013-04-221-11/+12
|
* Increase readability of ternary statement in build methodbuddhamagnet2013-04-201-2/+1
|
* replace match with get verb in ActionController::MetalGaurish Sharma2013-04-161-1/+1
|
* Return nil for Mime::NullType#refAndrew White2013-04-101-1/+1
|
* Reverts rendering behavior when format is unknownGrzegorz Świrski2013-04-101-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 typoRafael Mendonça França2013-04-091-2/+2
|
* fix AP warning; remove unused variableVipul A M2013-04-091-0/+1
|
* Merge pull request #9604 from sgrif/live_streaming_exceptionsRafael Mendonça França2013-04-081-0/+28
|\ | | | | Exceptions raised when using ActionController::Live cause server crash
| * Exception handling for controllers using ActionController::LiveSean Griffin2013-03-181-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-2Carlos Antonio da Silva2013-04-081-3/+3
|\ \ | | | | | | Mark unused block parameters.
| * | Remove unused block parametersAgis Anastasopoulos2013-04-071-3/+3
| | |
* | | Remove unecessary variable call, `#sort!` always returns an arrayAgis Anastasopoulos2013-04-071-1/+0
|/ /
* | Prefer find_by over dynamic finders in rdocSam Ruby2013-04-022-3/+3
| |
* | Fix some typosVipul A M2013-03-241-1/+1
| |
* | Fix documentation markup [ci skip]Rafael Mendonça França2013-03-231-0/+2
| |
* | StringIO is not required by default in JRubyArun Agrawal2013-03-221-0/+1
| |
* | Fix broken ActionController#action_missingJanko Luin2013-03-201-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 Dunbar2013-03-181-0/+1
|/
* Fix typos and improve docs a bit [ci skip]Carlos Antonio da Silva2013-03-151-7/+5
|
* document request simulation methods in functional tests.Yves Senn2013-03-151-7/+27
|
* Handle conditional get in live requests - this will prevent error when using ↵Bernard Potocki2013-03-141-0/+4
| | | | stale on live streams(issue #9636)
* Skip fetching path if the iteration is going to be skippedCarlos Antonio da Silva2013-03-111-2/+2
|
* Merge pull request #9626 from dasch/dasch/instrument-strong-paramsJosé Valim2013-03-092-1/+7
|\ | | | | Use AS::Notifications to instrument Strong Params
| * Use the instrumentation framework to instrument Strong ParamsDaniel Schierbeck2013-03-072-1/+7
| |
* | ensure response.stream is closedSam Ruby2013-03-091-0/+1
| |
* | Allow use of assert_template with the :file option.Justin Coyne2013-03-011-1/+16
|/ | | | This worked in Rails 3.2, but was a regression in 4.0.0.beta1
* fix respond_to without blocks not working if one of the blocks is allgrosser2013-02-241-1/+1
|
* This cache is not neededSantiago Pastorino2013-02-211-2/+1
|
* Use composition to figure out the forgery protection strategySantiago Pastorino2013-02-211-9/+27
|
* Rack::Test::UploadedFile is a permitted scalarFabio Kreusch2013-02-211-3/+4
|
* Fix #9168 Initialize NullCookieJar with all options needed for KeyGeneratorAndrey Chernih2013-02-081-1/+1
|
* partials inside directory work with `assert_template`Yves Senn2013-02-041-1/+2
| | | | | | | | | | previously when a partial was placed inside a directory (eg. '/dir/_partial'), `assert_template` did not replace the '_' prefix when looking through rendered tempaltes, which resulted in an error. I modified it to replace both, the leading '_' and the last '_' after a '/'.
* descriptive `assert_template` error when partial wasn't renderedYves Senn2013-02-041-0/+3
| | | | | | | When `assert_template` is used with the :locals option, and the partial was not rendered, a method_missing error was raised. This changes first checks, if the partial actually was rendered and raises a descriptive error.
* Missing require hash/keysAkira Matsuda2013-02-012-0/+3
|
* Missing or unneeded require extract_optionsAkira Matsuda2013-02-012-0/+2
|
* Use \A in RegexpsEgor Homakov2013-02-011-1/+1
| | | | | So, if there is redirect_to params[:q] i can send ?q=javascript:asdf()%0A/localpath Or something more nasty, so please use \A
* Remove caching_allowed? from ActionController::CachingMichiel Sikkes2013-01-281-4/+0
| | | | | Where is this used? No other code references to this method and it isn't being tested anywhere. No tests fail when commented out.
* Merge pull request #9032 from firmhouse/head-breaks-csrfSantiago Pastorino2013-01-281-2/+2
|\ | | | | Make HEAD work / convert to GET once more
| * Added request.head? to forgery protection codeMichiel Sikkes2013-01-221-2/+2
| |
* | Add keys/values methods to TestSessionCarlos Antonio da Silva2013-01-251-0/+8
| | | | | | | | Bring back the same API we have with Request::Session.
* | Integrate Action Pack with Rack 1.5Carlos Antonio da Silva2013-01-252-4/+18
| | | | | | | | | | | | All ActionPack and Railties tests are passing. Closes #8891. [Carlos Antonio da Silva + Santiago Pastorino]
* | ActionDispatch::Http::UploadedFile is a permitted scalar [Closes #9051]Xavier Noria2013-01-231-2/+5
|/
* Only check for unpermmited parameters ifRafael Mendonça França2013-01-221-1/+1
| | | | action_on_unpermitted_parameters is present
* avoid creating an object in every callXavier Noria2013-01-221-1/+2
| | | | This was a suggestion of @carlosantoniodasilva, thanks!
* Refactor grep call to remove .eachCarlos Antonio da Silva2013-01-201-1/+1
| | | | Grep already yields the matching keys to the given block.
* Use 1.9 hash style in docs/comments [ci skip]Carlos Antonio da Silva2013-01-201-3/+3
|