Commit Graph

42352 Commits

Author SHA1 Message Date
dmathieu
24434880d9 unscope doesn't remove only the default_scope, but all of them.
[ci-skip]
Closes rails/rails#14294
2014-03-07 14:52:44 +01:00
Hendy Tanata
589d1ed722 Update doc for TagHelper. 2014-03-05 11:54:18 -08:00
Hendy Tanata
cee7a06746 Improve collision explanation for Hash#transform_keys.
Based on comments at
42417b0013 (commitcomment-5527251)

[skip ci]
2014-02-28 11:31:58 -08:00
Hendy Tanata
245574ae02 Fix code alignment in duplicable? guide.
[skip ci]
2014-02-27 19:55:20 -08:00
Hendy Tanata
42417b0013 Improve guide for Hash#transform_keys and related methods.
[skip ci]
2014-02-27 19:55:08 -08:00
Zachary Scott
f302079d97 ✂️
This commit also addresses rails/docrails#169 and rails/rails#14159
2014-02-23 20:24:23 +11:00
Gaurish Sharma
b91d76131b Tweak Configuring Guide language
the fact that Rails is multi-thread by default is not very relevant. see https://github.com/rails/rails/pull/13998 [ci skip]
2014-02-23 12:35:53 +05:30
Mikhail Dieterle
4b95405818 typos fixes 2014-02-22 21:57:11 +03:00
Vijay Dev
b078f5ed84 Merge branch 'master' of github.com:rails/docrails 2014-02-20 22:28:37 +05:30
Carlos Antonio da Silva
17746181a3 Merge pull request #14120 from gregmolnar/guides
change 'assert !' to 'assert_not' in guides [ci skip]
2014-02-20 10:16:25 -03:00
Greg Molnar
fa8d35b4eb change 'assert !' to 'assert_not' in guides [ci skip] 2014-02-20 14:04:53 +01:00
Arun Agrawal
25ce856c3e Pointing to latest guides [ci skip] 2014-02-19 22:59:32 +01:00
Xavier Noria
a26394d748 Merge pull request #14102 from arthurnn/quietly_doc
Add note to silence_stream and quietly. [skip ci]
2014-02-19 17:53:13 +01:00
Arthur Neves
7a025b173f
Methods silence_stream/quietly are not thread-safe [skip ci]
State that on the doc.

[fixes #11954]
2014-02-19 11:49:18 -05:00
Arun Agrawal
a0d63c30cc Merge pull request #14107 from prakashmurthy/patch-1
Close the meta tag with '/>' instead of '>'
2014-02-19 09:58:07 +01:00
Prakash Murthy
9b3be63cca [ci skip] Close the meta tag with '/>' instead of '>'
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.
2014-02-19 13:39:31 +05:30
Guillermo Iguaran
1c248dfbab Fix render plain docs example in AM::Base
The errors were introduced in e220a34e39
2014-02-18 15:18:37 -05:00
Guillermo Iguaran
11645adf25 Merge pull request #14099 from robertomiranda/render-text-2-plain
Update Docs in favor to use render plain instead of text option
2014-02-18 15:11:33 -05:00
robertomiranda
e220a34e39 Update Docs in favor to use render plain instead of text option
ref #14062
2014-02-18 15:05:10 -05:00
Arthur Nogueira Neves
5dc6bf5fbc Merge pull request #14098 from Amit-Thawait/master
Typo fix for unscope [ci skip]
2014-02-18 14:33:25 -05:00
Amit Thawait
b74490e4f2 Typo fix for unscope 2014-02-18 11:26:54 -08:00
Rafael Mendonça França
33cb47ee48 Use the reference for the mime type to get the format
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
2014-02-18 16:12:51 -03:00
Rafael Mendonça França
1879c259b8 Merge branch '4-1-0-beta2'
Conflicts:
	actionview/CHANGELOG.md
	activerecord/CHANGELOG.md
2014-02-18 16:00:47 -03:00
Rafael Mendonça França
8b20c72dd8 Preparing for 4.1.0.beta2 release 2014-02-18 15:45:20 -03:00
Aaron Patterson
6256b1de9a Correctly escape PostgreSQL arrays.
Thanks Godfrey Chan for reporting this!

Fixes: CVE-2014-0080
2014-02-18 15:40:19 -03:00
Rafael Mendonça França
08d0a11a3f Escape format, negative_format and units options of number helpers
Previously the values of these options were trusted leading to
potential XSS vulnerabilities.

Fixes: CVE-2014-0081
2014-02-18 15:38:50 -03:00
Godfrey Chan
4f23760a07 Merge pull request #14097 from chancancode/sync_4_1_release_notes
Sync 4.1 release notes with changes since 7f648bc7
2014-02-18 09:59:15 -08:00
Godfrey Chan
578839bbbd Sync 4.1 release notes with changes since 7f648bc7 [ci skip] 2014-02-18 09:57:49 -08:00
Rafael Mendonça França
acc0e63327 Merge pull request #14062 from sikachu/ps-render-format
Introduce `:plain`, `:html`, and `:body` render options.
2014-02-18 14:13:49 -03:00
Prem Sichanugrist
ede0f8c62d Update upgrading guide regarding render :text 2014-02-18 12:11:41 -05:00
Prem Sichanugrist
3047376870 Add #no_content_type attribute to AD::Response
Setting this attribute to `true` will remove the content type header
from the request. This is use in `render :body` feature.
2014-02-18 12:11:41 -05:00
Prem Sichanugrist
9fe506e394 Add missing CHANGELOG entry to Action View 2014-02-18 12:11:41 -05:00
Prem Sichanugrist
76be30fe40 Update guides for new rendering options
* Introduces `:plain`, `:html`, `:body` render option.
* Update guide to use `render :plain` instead of `render :text`.
2014-02-18 12:11:41 -05:00
Prem Sichanugrist
79c4983f89 Cleanup ActionController::Rendering 2014-02-18 12:08:36 -05:00
Prem Sichanugrist
243e6e4b2a Fix a fragile test on action_view/render
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.
2014-02-18 12:08:36 -05:00
Prem Sichanugrist
920f3ba266 Introduce render :html for render HTML string
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.
2014-02-18 12:08:36 -05:00
Prem Sichanugrist
8cd9f6d205 Introduce render :plain for render plain text
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.
2014-02-18 12:08:36 -05:00
Prem Sichanugrist
9e9cc66077 Update hash format for render_text_test 2014-02-18 12:08:36 -05:00
Prem Sichanugrist
103e18c87d Introduce render :body for render raw content
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.
2014-02-18 12:08:36 -05:00
Rafael Mendonça França
6c496a6d2a Merge pull request #14095 from rails/rm-scopes
Document `default_scope` changes
2014-02-18 14:06:29 -03:00
Rafael Mendonça França
fc641a1a5b Don't use # => when it is not the expression values
[ci skip]
2014-02-18 13:49:31 -03:00
Rafael Mendonça França
967a6dc898 Fix the column name [ci skip] 2014-02-18 13:49:31 -03:00
Rafael Mendonça França
6370e69143 Document the default scopes change on the release notes, CHANGELOG
and upgrating guides

[ci skip]
2014-02-18 13:49:30 -03:00
Carlos Antonio da Silva
67e57ea7c0 Merge pull request #14094 from kalabiyau/fix_parameters_naming
Fix parameter naming in RemoteIp middleware constructor method [ci skip]
2014-02-18 13:02:25 -03:00
Carlos Antonio da Silva
68345d4a1a Move changelog entry to the top, fix examples indent [ci skip] 2014-02-18 12:53:01 -03:00
Carlos Antonio da Silva
76fec334ee Minor grammar/punctuation fixes [ci skip] 2014-02-18 12:50:02 -03:00
David Heinemeier Hansson
36bf5acd23 Use assert_nil instead as its clearer about what the return is expected to be 2014-02-18 16:40:26 +01:00
Guillermo Iguaran
8c4ca897a9 Merge pull request #14096 from arthurnn/precompile_all
Upgrade Doc: assets:precompile:all was removed on 4
2014-02-18 10:38:39 -05:00
David Heinemeier Hansson
4edca106da Added Object#present_in to simplify value whitelisting 2014-02-18 16:35:07 +01:00
Arthur Neves
4921d39488
Doc: assets:precompile:all was removed on 4 [skip ci] 2014-02-18 10:32:05 -05:00