Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Escape multibyte line terminators in JSON encoding | zackham | 2013-04-02 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, json/encoding respects the JSON spec (as it should) which disallows \n and \r inside strings, escaping them as expected. Unfortunately, ECMA-262 (Javascript) disallows not only \n and \r in strings, but "Line Terminators" which includes U+2028 and U+2029. See here: http://bclary.com/2004/11/07/#a-7.3 This pull request adds U+2028 and U+2029 to be escaped. # Why? It's very common to see something like this in a Rails template: <script type="text/javascript"> var posts = <%= @posts.to_json %>; </script> If U+2028 or U+2029 are part of any attributes output in the to_json call, you will end up with an exception. In Chrome: Uncaught SyntaxError: Unexpected token ILLEGAL # Why not? This is JSON encoding, and the JSON spec is specific about how to encode strings. U+2028 and U+2029 don't get special treatment. Just trying to start a discussion... what do you do in your apps to deal with this? Is there a convention I'm missing? | ||||
* | Merge pull request #10054 from rubys/use_find_by_in_rdoc | Santiago Pastorino | 2013-04-02 | 10 | -23/+23 |
|\ | | | | | Prefer find_by over dynamic finders in rdoc | ||||
| * | Prefer find_by over dynamic finders in rdoc | Sam Ruby | 2013-04-02 | 10 | -23/+23 |
| | | |||||
* | | Merge pull request #10055 from vipulnsward/remove_each_with_index_in_test | Santiago Pastorino | 2013-04-02 | 1 | -1/+1 |
|\ \ | |/ |/| | each_with_index => each as we dont use index | ||||
| * | each_with_index => each as we dont use index | Vipul A M | 2013-04-03 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #10053 from ↵ | Steve Klabnik | 2013-04-02 | 1 | -6/+30 |
|\ \ | |/ |/| | | | | | wangjohn/change_docs_for_associations_distinctness Changed the guides for associations, warning about race conditions when checking for distinctness | ||||
| * | Changed the guides to use distinct instead of uniq for associations (see | wangjohn | 2013-04-02 | 1 | -6/+30 |
| | | | | | | | | | | | | commit a1bb6c8b which changes the naming). I've also provided an example of how distinctness when inserting into an association can be achieved. | ||||
* | | Merge pull request #3782 from arunagw/warning_mode_on | Santiago Pastorino | 2013-04-02 | 1 | -1/+1 |
|\ \ | | | | | | | Turning on warnings in "rake test" for railties | ||||
| * | | Turning on warnings in "rake test" for railties | Arun Agrawal | 2013-04-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #9975 from ↵ | Aaron Patterson | 2013-04-02 | 2 | -14/+20 |
|\ \ \ | | | | | | | | | | | | | | | | | mmangino/raise_when_attributes_cant_be_unserialized Unserializing YAML attributes can silently fail in development mode | ||||
| * | | | Remove all error masking when decoding serialized data fails? | Mike Mangino | 2013-04-02 | 2 | -15/+12 |
| | | | | |||||
| * | | | Raise an exception when unserialization fails due to a missing class | Mike Mangino | 2013-03-28 | 2 | -1/+10 |
| | | | | |||||
* | | | | Merge pull request #9971 from kennyj/refactor_tasks | Rafael Mendonça França | 2013-04-02 | 11 | -61/+450 |
|\ \ \ \ | | | | | | | | | | | Extract Firebird / Sqlserver / Oracle database tasks, and They should be deprecated. | ||||
| * | | | | Add CHANGELOG entry about extracting and deprecating ↵ | kennyj | 2013-04-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | Firebird/Sqlserver/Oracle database tasks. | ||||
| * | | | | Show deprecated messages only when target database adapters defined | Yasuo Honda | 2013-04-03 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | Fix tiny problem: change method order for consistency and fix wrong method name. | kennyj | 2013-04-03 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Suppress deprecation messages for deprecated database tasks, when executing ↵ | kennyj | 2013-04-03 | 3 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | rails's testcases. | ||||
| * | | | | Add deprecation message on Firebird / Sqlserver / Oracle database tasks. | kennyj | 2013-04-03 | 3 | -0/+3 |
| | | | | | |||||
| * | | | | Extract Oracle database tasks. | kennyj | 2013-04-03 | 5 | -31/+140 |
| | | | | | |||||
| * | | | | Extract Sqlserver database tasks. | kennyj | 2013-04-03 | 5 | -11/+131 |
| | | | | | |||||
| * | | | | Extract Firebird database tasks. | kennyj | 2013-04-03 | 5 | -20/+151 |
| | | | | | |||||
* | | | | | Merge pull request #10052 from neerajdotname/stdout-in-log | Rafael Mendonça França | 2013-04-02 | 2 | -2/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | write sql queries to terminal | ||||
| * | | | | write sql queries to terminal | Neeraj Singh | 2013-04-02 | 2 | -2/+6 |
| | | | | | |||||
* | | | | | Merge pull request #10050 from neerajdotname/no-need-of-to_s-before-intern | Rafael Mendonça França | 2013-04-02 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | no need to invoke to_s before applying intern | ||||
| * | | | | no need to invoke to_s before applying intern | Neeraj Singh | 2013-04-02 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #10048 from ↵ | Rafael Mendonça França | 2013-04-02 | 1 | -17/+13 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | senny/replace_merge_with_relation_calls_in_count_api replace #merge with relation API calls in calculations_test. | ||||
| * | | | | replace #merge with relation API calls in calculations_test. | Yves Senn | 2013-04-02 | 1 | -17/+13 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #10038 from nateberkopec/sti-new-with-complex-inheritance | Rafael Mendonça França | 2013-04-02 | 2 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | Fix regression re: #new with an STI object & complex inheritance | ||||
| * | | | | Fix #new with an STI object with complex inheritance | Nate Berkopec | 2013-04-02 | 2 | -1/+5 |
| | | | | | |||||
* | | | | | Use released sdoc | Santiago Pastorino | 2013-04-02 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #10041 from vipulnsward/more_destructive_merge | Santiago Pastorino | 2013-04-02 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | change merge to merge! in AS on new hashes | ||||
| * | | | | change merge to merge! in AS on new hashes | Vipul A M | 2013-04-02 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #10042 from choudhuryanupam/fix_activesupport_test | Santiago Pastorino | 2013-04-02 | 6 | -25/+37 |
|\ \ \ \ \ | |/ / / / |/| | | | | Added missing assert | ||||
| * | | | | Added missing assert | Anupam Choudhury | 2013-04-02 | 6 | -25/+37 |
|/ / / / | |||||
* | | | | Revert "Use jquery-rails from github" | Santiago Pastorino | 2013-04-02 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8. Conflicts: railties/lib/rails/generators/app_base.rb | ||||
* | | | | Revert "Use jquery-rails from github (fix Gem::Version error)" | Santiago Pastorino | 2013-04-01 | 1 | -1/+1 |
|/ / / | | | | | | | | | | This reverts commit 6f3f0f86332004fcee5c2f05d52bbff08c22f980. | ||||
* | | | Merge pull request #10036 from ↵ | Rafael Mendonça França | 2013-04-01 | 2 | -3/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | wangjohn/norecord_error_message_consistency_issues Updated the error message for find to stay consistent across Rails | ||||
| * | | | Updated the error message for +find+ on an inverse_of association | wangjohn | 2013-04-01 | 2 | -3/+1 |
|/ / / | | | | | | | | | | | | | so that it is consistent with the error thrown for +find+ without an inverse_of association. | ||||
* | | | Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184a | Santiago Pastorino | 2013-04-01 | 3 | -10/+27 |
| | | | |||||
* | | | Revert more Rails.version changes | Rafael Mendonça França | 2013-04-01 | 4 | -5/+5 |
| | | | | | | | | | | | | Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc | ||||
* | | | Merge pull request #10022 from wangjohn/find_on_nonexistent_id_raises_error | Rafael Mendonça França | 2013-04-01 | 3 | -12/+55 |
|\ \ \ | | | | | | | | | Throwing a RecordNotFound exception when a record is scanned using the inverse_of option | ||||
| * | | | Throwing a RecordNotFound exception when a record is scanned using the | wangjohn | 2013-04-01 | 3 | -12/+55 |
| | | | | | | | | | | | | | | | | | | | | inverse_of option. I've also refactored the code for raising a RecordNotFound exception when searching for records with ids. | ||||
* | | | | :scissors: | Rafael Mendonça França | 2013-04-01 | 1 | -4/+4 |
|/ / / | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #10033 from kalabiyau/fix_typo_on_ap_mime_types_test | Rafael Mendonça França | 2013-04-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed typo on AP dispatch Mime::Type test | ||||
| * | | | Fixed typo on AP dispatch Mime::Type test | KalabiYau | 2013-04-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Remove CHANGELOG entry for #10002 | Rafael Mendonça França | 2013-04-01 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge pull request #10002 from charliesome/revert-version-method-on-rails | Jeremy Kemper | 2013-04-01 | 3 | -13/+16 |
|\ \ \ \ | |/ / / |/| | | | Reverts changes to Rails.version made in #8501 | ||||
| * | | | reverts changes to Rails.version made in #8501 | Charlie Somerville | 2013-03-30 | 3 | -13/+16 |
| | | | | |||||
* | | | | :uniq is still a valid relation option since it was only silently | Rafael Mendonça França | 2013-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deprecated Fixes activerecord-deprecated_finders build. https://travis-ci.org/rails/activerecord-deprecated_finders/builds/5964703 | ||||
* | | | | Merge pull request #10031 from trevorturk/cookie-store-auto-upgrade-docs | Santiago Pastorino | 2013-04-01 | 2 | -23/+40 |
|\ \ \ \ | | | | | | | | | | | Improve documentation around the cookie store auto-upgrade to encryption |