aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9032 from firmhouse/head-breaks-csrfSantiago Pastorino2013-01-282-2/+6
|\ | | | | Make HEAD work / convert to GET once more
| * Added request.head? to forgery protection codeMichiel Sikkes2013-01-221-2/+2
| |
| * Added a test that shows that a HEAD request does not normally pass CSRF ↵Michiel Sikkes2013-01-221-0/+4
| | | | | | | | protection
* | Use Encoding::UTF_8 constant :do_not_litter:Akira Matsuda2013-01-287-11/+11
| |
* | Use already defined Encoding constants rather than creating one-trip StringsAkira Matsuda2013-01-282-2/+2
| |
* | add fetch to CookieJarAaron Patterson2013-01-272-0/+34
| |
* | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-01-266-4/+98
|\ \ | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb guides/code/getting_started/app/controllers/comments_controller.rb
| * | generic pass before merging docrailsXavier Noria2013-01-264-422/+62
| | |
| * | :scissors: "raise" duplicationAkira Matsuda2013-01-261-2/+1
| | |
| * | Review #translate docs [ci skip]Carlos Antonio da Silva2013-01-201-8/+7
| | |
| * | Add documentation for abstract controller #translate and #localize method.Jens Bissinger2013-01-201-0/+10
| | |
| * | Add documentation to ActionDispatch::ResponseMatthew Stopa2013-01-201-0/+7
| | |
| * | fix broken examples format in image_tag helper [ci skip]Francesco Rodriguez2013-01-181-0/+2
| | |
| * | repeating documentation for option form helpersThiago Pinto2013-01-171-0/+286
| | |
| * | repeating documentation for date and time form helpersThiago Pinto2013-01-171-0/+148
| | |
| * | Fix typo introduced in 0004ca3aCarlos Antonio da Silva2013-01-161-1/+1
| | | | | | | | | | | | [ci skip]
| * | More documentation for ActionDispatch::ResponseMatthew Stopa2013-01-161-1/+3
| | | | | | | | | | | | [ci skip]
| * | Document ActionDispatch::Response#body methodMatthew Stopa2013-01-161-0/+1
| | |
* | | Add keys/values methods to TestSessionCarlos Antonio da Silva2013-01-252-5/+19
| | | | | | | | | | | | Bring back the same API we have with Request::Session.
* | | Integrate Action Pack with Rack 1.5Carlos Antonio da Silva2013-01-258-19/+37
| | | | | | | | | | | | | | | | | | All ActionPack and Railties tests are passing. Closes #8891. [Carlos Antonio da Silva + Santiago Pastorino]
* | | use the helpers list rather than getting the methods from the moduleAaron Patterson2013-01-241-1/+1
| | |
* | | module_eval is not necessary hereAaron Patterson2013-01-241-3/+1
| | |
* | | don't need to eval everythingAaron Patterson2013-01-241-1/+1
| | |
* | | Set Thread.abort_on_exception for the whole AS, AP, and AR testsAkira Matsuda + Koichi Sasada2013-01-241-0/+2
| | | | | | | | | | | | this would give us some more clues in case a test silently dies inside Thread
* | | ActionDispatch::Http::UploadedFile is a permitted scalar [Closes #9051]Xavier Noria2013-01-232-3/+7
| |/ |/|
* | Lets kepp using Ruby 1.9 syntaxRafael Mendonça França2013-01-222-37/+37
| |
* | 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!
* | Remove tabs, use spaces :scissors:Carlos Antonio da Silva2013-01-221-2/+2
| | | | | | | | [ci skip]
* | Merge branch 'isolating_tests'Akira Matsuda2013-01-222-2/+12
|\ \ | | | | | | | | | Now we're almost ready to remove this: https://github.com/rails/rails/blob/5294ad8/activesupport/lib/active_support/test_case.rb#L29
| * | Restore I18n.locale after running testsAkira Matsuda2013-01-221-1/+7
| | |
| * | Make sure to reset default_url_optionsAkira Matsuda2013-01-221-1/+5
| | |
* | | Stylistic pass at form_helper_testRafael Mendonça França2013-01-211-286/+362
| | |
* | | Capture block so content won't leak.José Mota2013-01-213-4/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The [following pull request](https://github.com/rails/rails/pull/8916) fixed the block being passed to the appropriate helper method. However, the content being passed into the block is generating repeated markup on the page due to some weird ERb evaluation. This commit tries to capture the block's generated output so the page isn't flooded with markup. [Rafael França + José Mota] Closes #8936
* | | Update actionpack's CHANGELOG for 445f14ePiotr Sarnacki2013-01-211-0/+5
| | |
* | | Fix asset_path in mounted enginePiotr Sarnacki2013-01-211-2/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Historically serving assets from a mountable engine could be achieved by running ActionDispatch::Static as a part of engine middleware stack or to copy assets prefixed with an engine name. After introduction of assets pipeline this is not needed as all of the assets are served or compiled into main application's assets. This commit removes the obsolete line making asset_path always generate paths relative to the root or config.relative_url_root if it's set. (closes #8119)
* | Duplicate possible frozen string from routeAndrew White2013-01-212-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 1.9 freezes Hash string keys by default so where a route is defined like this: get 'search' => 'search' then the Mapper will derive the action from the key. This blows up later when the action is added to the parameters hash and the encoding is forced. Closes #3429
* | Merge pull request #9014 from virusman/form_helpers_ar_testsRafael Mendonça França2013-01-212-0/+92
|\ \ | | | | | | AR integration tests for form helpers
| * | Added AR integration tests for form helpersvirusman2013-01-212-0/+92
| | |
* | | Merge pull request #9001 from schneems/schneems/routes-path-jsRafael Mendonça França2013-01-215-12/+134
|\ \ \ | | | | | | | | In Browser Path Matching with Javascript
| * | | In Browser Path Matching with Javascriptschneems2013-01-205-12/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When debugging routes ,it can sometimes be difficult to understand exactly how the paths are matched. This PR adds a JS based path matching widget to the `/rails/info/routes` output. You can enter in a path, and it will tell you which of the routes that path matches, while preserving order (top match wins). The matching widget in action: ![](http://f.cl.ly/items/3A2F0v2m3m1Z1p3P3O3k/path-match.gif) Prior to this PR the only way to check matching paths is via mental math, or typing in a path in the url bar and seeing where it goes. This feature will be an invaluable debugging tool by dramatically decreasing the time needed to check a path match. ATP actionpack
* | | | Fix setting expected value in translation testsCarlos Antonio da Silva2013-01-211-2/+2
| |/ / |/| | | | | | | | It was being set to nil instead due to the wrong assignment.
* | | Merge pull request #9007 from dpree/masterRafael Mendonça França2013-01-201-35/+46
|\ \ \ | |/ / |/| | Enhanced tests for AbstractController::Translation module
| * | Removed ActionController::Base dependency from abstract controller ↵Jens Bissinger2013-01-201-41/+46
| | | | | | | | | | | | translation tests.
| * | Test abstract controller's localize method.Jens Bissinger2013-01-201-0/+6
| | |
* | | Refactor grep call to remove .eachCarlos Antonio da Silva2013-01-201-1/+1
| | | | | | | | | | | | Grep already yields the matching keys to the given block.
* | | Add missing assert callsCarlos Antonio da Silva2013-01-201-2/+2
| | |
* | | Use 1.9 hash style in docs/comments [ci skip]Carlos Antonio da Silva2013-01-201-3/+3
| | |
* | | Fix markdown formatting to highlight block in changelog [ci skip]Carlos Antonio da Silva2013-01-201-2/+2
| | |
* | | Removing warning: shadowing outer local variable Arun Agrawal2013-01-201-3/+3
| | |