aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14098 from Amit-Thawait/masterArthur Nogueira Neves2014-02-182-2/+2
|\ | | | | Typo fix for unscope [ci skip]
| * Typo fix for unscopeAmit Thawait2014-02-182-2/+2
|/
* Use the reference for the mime type to get the formatRafael Mendonça França2014-02-184-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ça2014-02-1815-15/+83
|\ | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md
| * Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-1811-9/+17
| |
| * Correctly escape PostgreSQL arrays.Aaron Patterson2014-02-182-1/+13
| | | | | | | | | | | | Thanks Godfrey Chan for reporting this! Fixes: CVE-2014-0080
| * Escape format, negative_format and units options of number helpersRafael Mendonça França2014-02-182-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_notesGodfrey Chan2014-02-181-3/+11
|\ \ | | | | | | Sync 4.1 release notes with changes since 7f648bc7
| * | Sync 4.1 release notes with changes since 7f648bc7 [ci skip]Godfrey Chan2014-02-181-3/+11
|/ /
* | Merge pull request #14062 from sikachu/ps-render-formatRafael Mendonça França2014-02-1822-41/+762
|\ \ | | | | | | Introduce `:plain`, `:html`, and `:body` render options.
| * | Update upgrading guide regarding `render :text`Prem Sichanugrist2014-02-181-0/+19
| | |
| * | Add `#no_content_type` attribute to `AD::Response`Prem Sichanugrist2014-02-185-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 ViewPrem Sichanugrist2014-02-181-0/+5
| | |
| * | Update guides for new rendering optionsPrem Sichanugrist2014-02-183-6/+38
| | | | | | | | | | | | | | | * Introduces `:plain`, `:html`, `:body` render option. * Update guide to use `render :plain` instead of `render :text`.
| * | Cleanup `ActionController::Rendering`Prem Sichanugrist2014-02-181-11/+27
| | |
| * | Fix a fragile test on `action_view/render`Prem Sichanugrist2014-02-181-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 stringPrem Sichanugrist2014-02-188-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 textPrem Sichanugrist2014-02-186-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_testPrem Sichanugrist2014-02-181-18/+18
| | |
| * | Introduce `render :body` for render raw contentPrem Sichanugrist2014-02-1810-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-scopesRafael Mendonça França2014-02-184-12/+146
|\ \ | | | | | | Document `default_scope` changes
| * | Don't use `# =>` when it is not the expression valuesRafael Mendonça França2014-02-183-26/+26
| | | | | | | | | | | | [ci skip]
| * | Fix the column name [ci skip]Rafael Mendonça França2014-02-183-14/+14
| | |
| * | Document the default scopes change on the release notes, CHANGELOGRafael Mendonça França2014-02-183-0/+134
| | | | | | | | | | | | | | | | | | and upgrating guides [ci skip]
| * | Aesthetic [ci skip]Rafael Mendonça França2014-02-181-4/+4
| | |
| * | Tell default_scope are prepended [ci skip]Rafael Mendonça França2014-02-181-1/+1
| | |
| * | Updated doc for default scope [ci skip]Rashmi Yadav2014-02-181-4/+4
| | |
* | | Merge pull request #14094 from kalabiyau/fix_parameters_namingCarlos Antonio da Silva2014-02-181-2/+2
|\ \ \ | | | | | | | | Fix parameter naming in RemoteIp middleware constructor method [ci skip]
| * | | Fix parameter naming in RemoteIp middleware constructor methodKalabiYau2014-02-181-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 Silva2014-02-181-10/+10
| | |
* | | Minor grammar/punctuation fixes [ci skip]Carlos Antonio da Silva2014-02-181-4/+3
| | |
* | | Use assert_nil instead as its clearer about what the return is expected to beDavid Heinemeier Hansson2014-02-181-1/+1
| | |
* | | Merge pull request #14096 from arthurnn/precompile_allGuillermo Iguaran2014-02-181-1/+1
|\ \ \ | | | | | | | | Upgrade Doc: assets:precompile:all was removed on 4
| * | | Doc: assets:precompile:all was removed on 4 [skip ci]Arthur Neves2014-02-181-1/+1
| |/ /
* / / Added Object#present_in to simplify value whitelistingDavid Heinemeier Hansson2014-02-183-0/+29
|/ /
* | travel_to travels back and re-raises if the block raisesXavier Noria2014-02-182-3/+18
| |
* | adds a missing travel backXavier Noria2014-02-181-4/+4
| |
* | time helpers honor the application time zone when passed a dateXavier Noria2014-02-183-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails applications are expected to be always aware of the application time zone. To be consistent with that contract, we have to assume that a bare date passed to time helpers is a date in the application time zone, not in the system time zone. The system time zone is irrelevant, we should totally ignore it. For example, travel_to user.birth_date + 40.years should make that user be 40th years old regardless of the system time zone. Without this patch that may not be true.
* | Merge pull request #14000 from Fortisque/kevin/stream_error_managementAaron Patterson2014-02-173-0/+27
|\ \ | | | | | | streaming should change status of response when exception is caught
| * | Correct prestreaming controller response status.Kevin Casey2014-02-153-0/+27
| | | | | | | | | | | | | | | | | | if the controller action has not yet streamed any data, actions should process as normal, and errors should trigger the appropriate behavior (500, or in the case of ActionController::BadRequest, a 400 Bad Request)
* | | Merge pull request #14087 from 10io/patch-1Carlos Antonio da Silva2014-02-171-1/+1
|\ \ \ | | | | | | | | Fix coffeescript sample [ci skip]
| * | | Fix coffeescript sample [ci skip]David Fernandez2014-02-131-1/+1
| | | | | | | | | | | | Replace bind() with on() as suggested by the JQuery bind() documentation: https://api.jquery.com/bind/
* | | | Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"Rafael Mendonça França2014-02-173-21/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3ea840355409dc205a9e0d027fc09f1452636969, reversing changes made to e4cde5d58cbb09d1843796f96ba86225ff94fe05. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/query_methods.rb Reason: using `from` without `select` should not change the select list to SELECT * because it can lead different query results. If it is needed to change the table to a subquery or a view you can pass a table alias in the `from` call or use `select('subquery.*')`. Fixes #14049.
* | | | No need to use symbolsRafael Mendonça França2014-02-161-3/+3
| | | |
* | | | Don't skip tests if they are not broken. Just don't define theyRafael Mendonça França2014-02-162-9/+5
| | | |
* | | | Fix typo [ci skip]Rafael Mendonça França2014-02-162-2/+2
| | | |
* | | | Merge pull request #13512 from gsamokovarov/hstore_arrays_fixGuillermo Iguaran2014-02-164-7/+52
|\ \ \ \ | | | | | | | | | | Hstore arrays fix (follow up for #11444)
| * | | | Resolve encoding issues with arrays of hstore (bug 11135).Josh Goodall2014-02-174-7/+52
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We didn't have enough encoding for the wire protocol to store an array of hstore types. So, further encode any hstore that is an array member. Whilst we're here, ensure it's an HashWithIndifferentAccess being returned, to be consistent with other serialized forms, and add testing for arrays of hstore. So now the following migration: enable_extension "hstore" create_table :servers do |t| t.string :name t.hstore :interfaces, array: true end produces a model that can used like this, to store an array of hashes: server = Server.create(name: "server01", interfaces: [ { name: "bge0", ipv4: "192.0.2.2", state: "up" }, { name: "de0", state: "disabled", by: "misha" }, { name: "fe0", state: "up" }, ]) More at http://inopinatus.org/2013/07/12/using-arrays-of-hstore-with-rails-4/
* | | | Merge pull request #13937 from ktaragorn/guides_fixesVijay Dev2014-02-162-3/+14
|\ \ \ \ | | | | | | | | | | Guides fixes
| * | | | Getting started guide fixes & Explain X-SendFile a little better, with linksKarthik T2014-02-142-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain how form_for :article is able to pull in the properties of @article Make it clear that article_id is generated due to the association set up Add link to the rails function that uses X-Sendfile. Add links to apache and nginx docs for the header
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 20:58:08 +0000