Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | add fetch to CookieJar | Aaron Patterson | 2013-01-27 | 2 | -0/+34 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'docrails/master' | Xavier Noria | 2013-01-26 | 6 | -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 docrails | Xavier Noria | 2013-01-26 | 4 | -422/+62 | |
| | | | | ||||||
| * | | | :scissors: "raise" duplication | Akira Matsuda | 2013-01-26 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | Review #translate docs [ci skip] | Carlos Antonio da Silva | 2013-01-20 | 1 | -8/+7 | |
| | | | | ||||||
| * | | | Add documentation for abstract controller #translate and #localize method. | Jens Bissinger | 2013-01-20 | 1 | -0/+10 | |
| | | | | ||||||
| * | | | Add documentation to ActionDispatch::Response | Matthew Stopa | 2013-01-20 | 1 | -0/+7 | |
| | | | | ||||||
| * | | | fix broken examples format in image_tag helper [ci skip] | Francesco Rodriguez | 2013-01-18 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | repeating documentation for option form helpers | Thiago Pinto | 2013-01-17 | 1 | -0/+286 | |
| | | | | ||||||
| * | | | repeating documentation for date and time form helpers | Thiago Pinto | 2013-01-17 | 1 | -0/+148 | |
| | | | | ||||||
| * | | | Fix typo introduced in 0004ca3a | Carlos Antonio da Silva | 2013-01-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | More documentation for ActionDispatch::Response | Matthew Stopa | 2013-01-16 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | Document ActionDispatch::Response#body method | Matthew Stopa | 2013-01-16 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Add keys/values methods to TestSession | Carlos Antonio da Silva | 2013-01-25 | 2 | -5/+19 | |
| | | | | | | | | | | | | | | | | Bring back the same API we have with Request::Session. | |||||
* | | | | Integrate Action Pack with Rack 1.5 | Carlos Antonio da Silva | 2013-01-25 | 8 | -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 module | Aaron Patterson | 2013-01-24 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | module_eval is not necessary here | Aaron Patterson | 2013-01-24 | 1 | -3/+1 | |
| | | | | ||||||
* | | | | don't need to eval everything | Aaron Patterson | 2013-01-24 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Set Thread.abort_on_exception for the whole AS, AP, and AR tests | Akira Matsuda + Koichi Sasada | 2013-01-24 | 1 | -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 Noria | 2013-01-23 | 2 | -3/+7 | |
| |/ / |/| | | ||||||
* | | | Lets kepp using Ruby 1.9 syntax | Rafael Mendonça França | 2013-01-22 | 2 | -37/+37 | |
| | | | ||||||
* | | | Only check for unpermmited parameters if | Rafael Mendonça França | 2013-01-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | action_on_unpermitted_parameters is present | |||||
* | | | avoid creating an object in every call | Xavier Noria | 2013-01-22 | 1 | -1/+2 | |
| | | | | | | | | | | | | This was a suggestion of @carlosantoniodasilva, thanks! | |||||
* | | | Remove tabs, use spaces :scissors: | Carlos Antonio da Silva | 2013-01-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | [ci skip] | |||||
* | | | Merge branch 'isolating_tests' | Akira Matsuda | 2013-01-22 | 2 | -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 tests | Akira Matsuda | 2013-01-22 | 1 | -1/+7 | |
| | | | | ||||||
| * | | | Make sure to reset default_url_options | Akira Matsuda | 2013-01-22 | 1 | -1/+5 | |
| | | | | ||||||
* | | | | Stylistic pass at form_helper_test | Rafael Mendonça França | 2013-01-21 | 1 | -286/+362 | |
| | | | | ||||||
* | | | | Capture block so content won't leak. | José Mota | 2013-01-21 | 3 | -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 445f14e | Piotr Sarnacki | 2013-01-21 | 1 | -0/+5 | |
| | | | | ||||||
* | | | | Fix asset_path in mounted engine | Piotr Sarnacki | 2013-01-21 | 1 | -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 route | Andrew White | 2013-01-21 | 2 | -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_tests | Rafael Mendonça França | 2013-01-21 | 2 | -0/+92 | |
|\ \ \ | | | | | | | | | AR integration tests for form helpers | |||||
| * | | | Added AR integration tests for form helpers | virusman | 2013-01-21 | 2 | -0/+92 | |
| | | | | ||||||
* | | | | Merge pull request #9001 from schneems/schneems/routes-path-js | Rafael Mendonça França | 2013-01-21 | 5 | -12/+134 | |
|\ \ \ \ | | | | | | | | | | | In Browser Path Matching with Javascript | |||||
| * | | | | In Browser Path Matching with Javascript | schneems | 2013-01-20 | 5 | -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 tests | Carlos Antonio da Silva | 2013-01-21 | 1 | -2/+2 | |
| |/ / / |/| | | | | | | | | | | | It was being set to nil instead due to the wrong assignment. | |||||
* | | | | Merge pull request #9007 from dpree/master | Rafael Mendonça França | 2013-01-20 | 1 | -35/+46 | |
|\ \ \ \ | |/ / / |/| | | | Enhanced tests for AbstractController::Translation module | |||||
| * | | | Removed ActionController::Base dependency from abstract controller ↵ | Jens Bissinger | 2013-01-20 | 1 | -41/+46 | |
| | | | | | | | | | | | | | | | | translation tests. | |||||
| * | | | Test abstract controller's localize method. | Jens Bissinger | 2013-01-20 | 1 | -0/+6 | |
| | | | | ||||||
* | | | | Refactor grep call to remove .each | Carlos Antonio da Silva | 2013-01-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Grep already yields the matching keys to the given block. | |||||
* | | | | Add missing assert calls | Carlos Antonio da Silva | 2013-01-20 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Use 1.9 hash style in docs/comments [ci skip] | Carlos Antonio da Silva | 2013-01-20 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Fix markdown formatting to highlight block in changelog [ci skip] | Carlos Antonio da Silva | 2013-01-20 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Removing warning: shadowing outer local variable | Arun Agrawal | 2013-01-20 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | strong parameters filters permitted scalars | Xavier Noria | 2013-01-20 | 4 | -39/+273 | |
|/ / / | ||||||
* | | | Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependency | Aaron Patterson | 2013-01-19 | 2 | -3/+9 | |
|\ \ \ | | | | | | | | | Remove i18n symbol dependency | |||||
| * | | | Don't change the original i18n data | Chris McGrath | 2013-01-17 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Remove i18n symbol dependency | Chris McGrath | 2013-01-17 | 2 | -3/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | date.order is the only key in rails i18n that is required to be a symbol. This patch allows for symbols or strings which means: * No requirement for symbol type in .yml files. A future YAML.safe_load wouldn't need to load symbols * Rails could actually use json rather than yml as the backend | |||||
* | | | | Restore and adapt the implementation reverted at | Rafael Mendonça França | 2013-01-19 | 4 | -37/+66 | |
| | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/cc1c3c5be061e7572018f734e5239750ab449e3f Now instead of raise, we log by default in development and test |