aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Removing warning: shadowing outer local variable Arun Agrawal2013-01-201-3/+3
|
* strong parameters filters permitted scalarsXavier Noria2013-01-201-22/+92
|
* Restore and adapt the implementation reverted atRafael Mendonça França2013-01-192-29/+58
| | | | | | https://github.com/rails/rails/commit/cc1c3c5be061e7572018f734e5239750ab449e3f Now instead of raise, we log by default in development and test
* Added ability to raise or log on unpermitted params.Thomas Drake-Brockman2013-01-202-6/+34
|
* Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by"Guillermo Iguaran2013-01-182-3/+3
| | | | | This reverts commit 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a, reversing changes made to 5937bd02dee112646469848d7fe8a8bfcef5b4c1.
* User Rails 4 find_byrobertomiranda2013-01-182-3/+3
|
* Remove useless || operationCarlos Antonio da Silva2013-01-171-2/+1
|
* Deprecate direct calls to AC::RecordIdentifier.dom_id and dom_classCarlos Antonio da Silva2013-01-161-5/+17
| | | | Also add some generic tests to ensure they're properly deprecated.
* strong parameters exception handlingBrian Alexander2013-01-151-6/+0
|
* Revert "log at debug level what line caused the redirect_to"Carlos Antonio da Silva2013-01-151-1/+0
| | | | | | | | This reverts commit 3fa00070047b5d019d39e691598ee2890283d052. Reason: This message is usually not accurate and annoying: Redirected by ~/.rbenv/versions/1.9.3-p327-perf/lib/ruby/1.9.1/logger.rb:371:in `add'`
* Merge pull request #8876 from senny/extract_performance_testsGuillermo Iguaran2013-01-101-3/+0
|\ | | | | Extract ActionDispatch::PerformanceTest
| * extract PerformanceTest into rails-performance_tests gemYves Senn2013-01-101-3/+0
| |
* | Merge pull request #8821 from jamis/masterRafael Mendonça França2013-01-101-5/+1
|\ \ | |/ |/| | | | | | | | | Evaluate view_cache_dependencies at the instance level Conflicts: actionpack/lib/action_controller/caching.rb
| * evaluate the dependency blocks at the instance level, not class levelJamis Buck2013-01-081-5/+1
| |
* | Fix typo in deprecation warningNathaniel Jones2013-01-091-1/+1
| |
* | Fix warning: & interpreted as argument prefixCarlos Antonio da Silva2013-01-081-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-01-094-10/+10
|\ \ | |/ |/| | | | | Conflicts: guides/source/getting_started.md
| * prefer american spelling of 'behavior'Gosha Arinich2013-01-071-1/+1
| |
| * HTTP 302 means Found, not MovedChase DuBois2013-01-051-1/+1
| |
| * PUT => PATCHAkira Matsuda2013-01-031-1/+1
| |
| * find_or_create_by is deprecated in AR 4Akira Matsuda2013-01-021-3/+3
| |
| * Model.scoped is deprecated in favour of Model.allAkira Matsuda2013-01-021-4/+4
| |
* | view_cache_dependency APIJamis Buck2013-01-081-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | A declarative API for specifying dependencies that affect template cache digest computation. In your controller, specify any of said dependencies: view_cache_dependency { "phone" if using_phone? } When the block is evaluated, the resulting value is included in the cache digest calculation, allowing you to generate different digests for effectively the same template. (Mostly useful if you're mucking with template load paths.)
* | Revert "unpermitted params" exception -- it's just not going to work. See ↵David Heinemeier Hansson2013-01-082-59/+11
| | | | | | | | the discussion on https://github.com/rails/strong_parameters/pull/75.