aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Handle missing environment from non empty configschneems2014-02-212-24/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | If using a `DATABASE_URL` and a `database.yml`. The connection information in `DATABASE_URL` should be merged into whatever environment we are in. As released in 4.1.0rc1 if someone has a database.yml but is missing a key like production: ```yml development: host: localhost ``` Then the check for blank config will return false so the information from the `DATABASE_URL` will not be used when attempting to connect to the `production` database and the connection will incorrectly fail. This commit fixes this problem and adds a test for the behavior. In addition the ability to specify a connection url in a `database.yml` like this: ``` production: postgres://localhost/foo ``` Was introduced in 4.1.0rc1 though should not be used, instead using a url sub key ``` production: url: postgres://localhost/foo ``` This url sub key was also introduced in 4.1.0rc1 though the `production: postgres://localhost/foo` was not removed. As a result we should not test this behavior.
* Merge pull request #14140 from WojtekKruszewski/optimize_foreign_key_forCarlos Antonio da Silva2014-02-211-1/+1
|\ | | | | Prevent foreign_key_for? from evaluating all attributes
| * Prevent foreign_key_for? from type casting all attributesWojtek Kruszewski2014-02-211-1/+1
| |
* | Revert "Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665."Guillermo Iguaran2014-02-213-26/+2
|/ | | | | | | | | | | | This reverts commit e0a521cfcd13e4d1f0ae8ab96004289e1c020f71. Conflicts: railties/CHANGELOG.md We expect loggers to quack like stdlib logger. If log4r needs different level= assignment, using a Logger-quacking wrapper is the way to do it. Fixes #14114.
* releasing Rails no longer needs triggering docs generation by hand [ci skip]Xavier Noria2014-02-202-37/+0
| | | | | | GitHub is now able to notify tag creation, I have configured the webhook for the docs server to receive that event. Therefore, we no longer need to trigger docs generation manually when releasing.
* Merge pull request #14131 from kuldeepaggarwal/upgrade-rails-versionArthur Nogueira Neves2014-02-201-2/+2
|\ | | | | update guides to new version of rails 3.2.x, i.e. 3.2.17 [skip ci]
| * [ci skip] update guides to new version of rails 3.2.xKuldeep Aggarwal2014-02-211-2/+2
|/
* adding a test for #14106Aaron Patterson2014-02-201-0/+25
|
* Revert "context in validation goes through has many relationship"Aaron Patterson2014-02-204-27/+1
| | | | This reverts commit 5e3d466d52fa4e9a42c3a1f8773a7c31da875e48.
* Merge pull request #14129 from joankaradimov/fix-render-to-stringCarlos Antonio da Silva2014-02-201-1/+3
|\ | | | | Fix `render_to_string` when called via manually instantiated controllers
| * Check if the `request` variable isn't nil when calling render_to_stringJoan Karadimov2014-02-201-1/+3
| | | | | | | | closes #14125
* | Merge pull request #14086 from jingweno/masterArthur Nogueira Neves2014-02-201-1/+1
|\ \ | | | | | | Fix the javascript path in guide for asset modules [skip ci]
| * | [skip ci] Fix the javascript path in guide for asset modulesJingwen Owen Ou2014-02-201-1/+1
| | |
* | | Merge pull request #14124 from arthurnn/fix_14116Aaron Patterson2014-02-202-5/+8
|\ \ \ | |_|/ |/| | Fix collection proxy exists? regression
| * | Add regression test for collection proxy readerArthur Neves2014-02-201-0/+7
| | | | | | | | | | | | [related #14116]
| * | Revert "speed up the collection proxy reader method, but slow down the ↵Arthur Neves2014-02-201-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | constructor" This reverts commit f9e4c3c7c0c4152b62fe9202a9d12262884bb118. [fixes #14116]
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-201-0/+7
|\ \ \ | |/ / |/| |
| * | Add tip about using RDoc's --pipe command to quickly test the output ofZachary Scott2014-02-101-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/guidesCarlos Antonio da Silva2014-02-201-3/+3
|\ \ \ | | | | | | | | change 'assert !' to 'assert_not' in guides [ci skip]
| * | | change 'assert !' to 'assert_not' in guides [ci skip]Greg Molnar2014-02-201-3/+3
|/ / /
* | | Pointing to latest guides [ci skip]Arun Agrawal2014-02-191-1/+1
| | |
* | | Merge pull request #14102 from arthurnn/quietly_docXavier Noria2014-02-191-0/+4
|\ \ \ | | | | | | | | Add note to silence_stream and quietly. [skip ci]
| * | | Methods silence_stream/quietly are not thread-safe [skip ci]Arthur Neves2014-02-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | State that on the doc. [fixes #11954]
* | | | Merge pull request #14107 from prakashmurthy/patch-1Arun Agrawal2014-02-191-1/+1
|\ \ \ \ | | | | | | | | | | Close the meta tag with '/>' instead of '>'
| * | | | [ci skip] Close the meta tag with '/>' instead of '>'Prakash Murthy2014-02-191-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::BaseGuillermo Iguaran2014-02-181-2/+2
| | | | | | | | | | | | The errors were introduced in e220a34e39
* | | | Merge pull request #14099 from robertomiranda/render-text-2-plainGuillermo Iguaran2014-02-184-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 optionrobertomiranda2014-02-184-11/+11
|/ / / / | | | | | | | | | | | | ref #14062
* | | | 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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 21:46:07 +0000