Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "context in validation goes through has many relationship" | Aaron Patterson | 2014-02-20 | 4 | -27/+1 |
| | | | | This reverts commit 5e3d466d52fa4e9a42c3a1f8773a7c31da875e48. | ||||
* | Merge pull request #14129 from joankaradimov/fix-render-to-string | Carlos Antonio da Silva | 2014-02-20 | 1 | -1/+3 |
|\ | | | | | Fix `render_to_string` when called via manually instantiated controllers | ||||
| * | Check if the `request` variable isn't nil when calling render_to_string | Joan Karadimov | 2014-02-20 | 1 | -1/+3 |
| | | | | | | | | closes #14125 | ||||
* | | Merge pull request #14086 from jingweno/master | Arthur Nogueira Neves | 2014-02-20 | 1 | -1/+1 |
|\ \ | | | | | | | Fix the javascript path in guide for asset modules [skip ci] | ||||
| * | | [skip ci] Fix the javascript path in guide for asset modules | Jingwen Owen Ou | 2014-02-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #14124 from arthurnn/fix_14116 | Aaron Patterson | 2014-02-20 | 2 | -5/+8 |
|\ \ \ | |_|/ |/| | | Fix collection proxy exists? regression | ||||
| * | | Add regression test for collection proxy reader | Arthur Neves | 2014-02-20 | 1 | -0/+7 |
| | | | | | | | | | | | | [related #14116] | ||||
| * | | Revert "speed up the collection proxy reader method, but slow down the ↵ | Arthur Neves | 2014-02-20 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | constructor" This reverts commit f9e4c3c7c0c4152b62fe9202a9d12262884bb118. [fixes #14116] | ||||
* | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-02-20 | 1 | -0/+7 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add tip about using RDoc's --pipe command to quickly test the output of | Zachary Scott | 2014-02-10 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | a piece of documentation. This can be useful for trying out combinations of markup and code, as discussed in rails/rails@225bcad | ||||
* | | | Merge pull request #14120 from gregmolnar/guides | Carlos Antonio da Silva | 2014-02-20 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | change 'assert !' to 'assert_not' in guides [ci skip] | ||||
| * | | | change 'assert !' to 'assert_not' in guides [ci skip] | Greg Molnar | 2014-02-20 | 1 | -3/+3 |
|/ / / | |||||
* | | | Pointing to latest guides [ci skip] | Arun Agrawal | 2014-02-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #14102 from arthurnn/quietly_doc | Xavier Noria | 2014-02-19 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Add note to silence_stream and quietly. [skip ci] | ||||
| * | | | Methods silence_stream/quietly are not thread-safe [skip ci] | Arthur Neves | 2014-02-19 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | State that on the doc. [fixes #11954] | ||||
* | | | | Merge pull request #14107 from prakashmurthy/patch-1 | Arun Agrawal | 2014-02-19 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Close the meta tag with '/>' instead of '>' | ||||
| * | | | | [ci skip] Close the meta tag with '/>' instead of '>' | Prakash Murthy | 2014-02-19 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the 42 instances of `end tag for "meta" omitted, but OMITTAG NO was specified` error message that comes up when the full railsguides are validated. Full error list at https://gist.github.com/prakashmurthy/9086679. | ||||
* | | | | Fix render plain docs example in AM::Base | Guillermo Iguaran | 2014-02-18 | 1 | -2/+2 |
| | | | | | | | | | | | | The errors were introduced in e220a34e39 | ||||
* | | | | Merge pull request #14099 from robertomiranda/render-text-2-plain | Guillermo Iguaran | 2014-02-18 | 4 | -11/+11 |
|\ \ \ \ | | | | | | | | | | | Update Docs in favor to use render plain instead of text option | ||||
| * | | | | Update Docs in favor to use render plain instead of text option | robertomiranda | 2014-02-18 | 4 | -11/+11 |
|/ / / / | | | | | | | | | | | | | ref #14062 | ||||
* | | | | Merge pull request #14098 from Amit-Thawait/master | Arthur Nogueira Neves | 2014-02-18 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Typo fix for unscope [ci skip] | ||||
| * | | | | Typo fix for unscope | Amit Thawait | 2014-02-18 | 2 | -2/+2 |
|/ / / / | |||||
* | | | | Use the reference for the mime type to get the format | Rafael Mendonça França | 2014-02-18 | 4 | -2/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we were calling to_sym in the mime type, even when it is unknown what can cause denial of service since symbols are not removed by the garbage collector. Fixes: CVE-2014-0082 | ||||
* | | | | Merge branch '4-1-0-beta2' | Rafael Mendonça França | 2014-02-18 | 15 | -15/+83 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md | ||||
| * | | | | Preparing for 4.1.0.beta2 release | Rafael Mendonça França | 2014-02-18 | 11 | -9/+17 |
| | | | | | |||||
| * | | | | Correctly escape PostgreSQL arrays. | Aaron Patterson | 2014-02-18 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks Godfrey Chan for reporting this! Fixes: CVE-2014-0080 | ||||
| * | | | | Escape format, negative_format and units options of number helpers | Rafael Mendonça França | 2014-02-18 | 2 | -5/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the values of these options were trusted leading to potential XSS vulnerabilities. Fixes: CVE-2014-0081 | ||||
* | | | | | Merge pull request #14097 from chancancode/sync_4_1_release_notes | Godfrey Chan | 2014-02-18 | 1 | -3/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Sync 4.1 release notes with changes since 7f648bc7 | ||||
| * | | | | | Sync 4.1 release notes with changes since 7f648bc7 [ci skip] | Godfrey Chan | 2014-02-18 | 1 | -3/+11 |
|/ / / / / | |||||
* | | | | | Merge pull request #14062 from sikachu/ps-render-format | Rafael Mendonça França | 2014-02-18 | 22 | -41/+762 |
|\ \ \ \ \ | | | | | | | | | | | | | Introduce `:plain`, `:html`, and `:body` render options. | ||||
| * | | | | | Update upgrading guide regarding `render :text` | Prem Sichanugrist | 2014-02-18 | 1 | -0/+19 |
| | | | | | | |||||
| * | | | | | Add `#no_content_type` attribute to `AD::Response` | Prem Sichanugrist | 2014-02-18 | 5 | -11/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting this attribute to `true` will remove the content type header from the request. This is use in `render :body` feature. | ||||
| * | | | | | Add missing CHANGELOG entry to Action View | Prem Sichanugrist | 2014-02-18 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Update guides for new rendering options | Prem Sichanugrist | 2014-02-18 | 3 | -6/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduces `:plain`, `:html`, `:body` render option. * Update guide to use `render :plain` instead of `render :text`. | ||||
| * | | | | | Cleanup `ActionController::Rendering` | Prem Sichanugrist | 2014-02-18 | 1 | -11/+27 |
| | | | | | | |||||
| * | | | | | Fix a fragile test on `action_view/render` | Prem Sichanugrist | 2014-02-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test were assuming that the list of render options will always be the same. Fixing that so this doesn't break when we add/remove render option in the future. | ||||
| * | | | | | Introduce `render :html` for render HTML string | Prem Sichanugrist | 2014-02-18 | 8 | -3/+242 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an option for to HTML content with a content type of `text/html`. This rendering option calls `ERB::Util.html_escape` internally to escape unsafe HTML string, so you will have to mark your string as html safe if you have any HTML tag in it. Please see #12374 for more detail. | ||||
| * | | | | | Introduce `render :plain` for render plain text | Prem Sichanugrist | 2014-02-18 | 6 | -4/+192 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is as an option to render content with a content type of `text/plain`. This is the preferred option if you are planning to render a plain text content. Please see #12374 for more detail. | ||||
| * | | | | | Update hash format for render_text_test | Prem Sichanugrist | 2014-02-18 | 1 | -18/+18 |
| | | | | | | |||||
| * | | | | | Introduce `render :body` for render raw content | Prem Sichanugrist | 2014-02-18 | 10 | -11/+219 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an option for sending a raw content back to browser. Note that this rendering option will unset the default content type and does not include "Content-Type" header back in the response. You should only use this option if you are expecting the "Content-Type" header to not be set. More information on "Content-Type" header can be found on RFC 2616, section 7.2.1. Please see #12374 for more detail. | ||||
* | | | | | Merge pull request #14095 from rails/rm-scopes | Rafael Mendonça França | 2014-02-18 | 4 | -12/+146 |
|\ \ \ \ \ | | | | | | | | | | | | | Document `default_scope` changes | ||||
| * | | | | | Don't use `# =>` when it is not the expression values | Rafael Mendonça França | 2014-02-18 | 3 | -26/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | Fix the column name [ci skip] | Rafael Mendonça França | 2014-02-18 | 3 | -14/+14 |
| | | | | | | |||||
| * | | | | | Document the default scopes change on the release notes, CHANGELOG | Rafael Mendonça França | 2014-02-18 | 3 | -0/+134 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and upgrating guides [ci skip] | ||||
| * | | | | | Aesthetic [ci skip] | Rafael Mendonça França | 2014-02-18 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Tell default_scope are prepended [ci skip] | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Updated doc for default scope [ci skip] | Rashmi Yadav | 2014-02-18 | 1 | -4/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #14094 from kalabiyau/fix_parameters_naming | Carlos Antonio da Silva | 2014-02-18 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix parameter naming in RemoteIp middleware constructor method [ci skip] | ||||
| * | | | | | Fix parameter naming in RemoteIp middleware constructor method | KalabiYau | 2014-02-18 | 1 | -2/+2 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | Was custom_proxies in inline docs, but should be and defined in constructor as custom_proxies | ||||
* | | | | | Move changelog entry to the top, fix examples indent [ci skip] | Carlos Antonio da Silva | 2014-02-18 | 1 | -10/+10 |
| | | | | |