| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | minor rdoc cleanup for reflection methods | Neeraj Singh | 2013-05-09 | 1 | -4/+4 | |
| | | | | | | ||||||
| | * | | | | Fix Typo xml -> XML, json -> JSON | Prathamesh Sonpatki | 2013-05-08 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | Changed spelling of Busines to Business | aditya-kapoor | 2013-05-08 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | according to @fxn it's ERB not ERb. | Yves Senn | 2013-05-07 | 1 | -2/+1 | |
| | | | | | | ||||||
| | * | | | | XML-files isn't a word | Waynn Lue | 2013-05-06 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Fix grammar on AM.mailer_name documentation. | Hendy Tanata | 2013-05-06 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Improve model generator USAGE grammar | Matthew Michihara | 2013-05-05 | 1 | -5/+5 | |
| | | | | | | ||||||
| | * | | | | 2.15.1 is the first release that supports Rails 4. | Sam Ruby | 2013-05-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | specifically manifest.json | |||||
| | * | | | | dir -> directory | Prathamesh Sonpatki | 2013-05-04 | 2 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | Changing the wordings in a few places | Akshay Khole | 2013-05-04 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | comments in the callbacks description are in present tense | Akshay Khole | 2013-05-04 | 1 | -3/+3 | |
| | | | | | | ||||||
| | * | | | | Update CreateComments migration to reflect the output from Rails 4. | Douglas Teoh | 2013-05-04 | 1 | -9/+5 | |
| | | | | | | ||||||
| | * | | | | Fix another incorrect post_path link generation. | Douglas Teoh | 2013-05-04 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Remove unopened closing brace. | Douglas Teoh | 2013-05-04 | 1 | -2/+1 | |
| | | | | | | ||||||
| | * | | | | Fix incorrect post_path link generation. | Douglas Teoh | 2013-05-04 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Add some documentation for AM.mailer_name | Prem Sichanugrist | 2013-05-03 | 1 | -0/+2 | |
| | | | | | | ||||||
| | * | | | | replace apostrophe with backquote for matching [ci skip] | Anton Kalyaev | 2013-05-03 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | Capitalizing internet to Internet. [ci skip] | Akshay Khole | 2013-05-03 | 2 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | added to rdoc for unscope that default_scope wins | Neeraj Singh | 2013-05-03 | 1 | -0/+3 | |
| | | | | | | ||||||
| | * | | | | Simple grammar updates | Jonathan Roes | 2013-05-03 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | fix typo | Vipul A M | 2013-05-02 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | document String#to_time exception | Vipul A M | 2013-05-02 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | Clean up the wording in a few places | Jonathan Roes | 2013-05-01 | 1 | -4/+4 | |
| | | | | | | ||||||
| | * | | | | Add a few overview bullet points | Jonathan Roes | 2013-05-01 | 1 | -0/+4 | |
| | | | | | | ||||||
| | * | | | | Fix typo "can exploited" with "can be exploited" | Leo Gallucci | 2013-05-01 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Rails 4 has deprecated :order in has_many to use a lambda instead, update ↵ | Nick Quaranto | 2013-05-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | the guide accordingly | |||||
| * | | | | | Merge pull request #10576 from sferik/remove_multi_json_dependency | Yehuda Katz | 2013-05-11 | 4 | -46/+19 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Replace multi_json with json | |||||
| | * | | | | | Replace multi_json with json | Erik Michaels-Ober | 2013-05-11 | 4 | -46/+19 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #10574 from wangjohn/automatic_inverse_of_documentation | Rafael Mendonça França | 2013-05-11 | 3 | -1/+33 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Adding documentation to the automatic inverse_of finder. | |||||
| | * | | | | | Adding documentation to the automatic inverse_of finder. | wangjohn | 2013-05-11 | 3 | -1/+33 | |
| |/ / / / / | ||||||
| * | | | | | Improve CHANGELOG entry [ci kip] | Rafael Mendonça França | 2013-05-11 | 1 | -6/+10 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #10503 from kstevens715/master | Rafael Mendonça França | 2013-05-11 | 3 | -1/+32 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Avoid method missing when calling assume_migrated_upto_version (master) | |||||
| | * | | | | | Call assume_migrated_upto_version on connection | Kyle Stevens | 2013-05-11 | 3 | -1/+32 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call assume_migrated_upto_version on connection to prevent it from first being picked up in method_missing. In the base class, Migration, method_missing expects the argument to be a table name, and calls proper_table_name on the arguments before sending to connection. If table_name_prefix or table_name_suffix is used, the schema version changes to prefix_version_suffix, breaking `rake test:prepare`. Fixes #10411. | |||||
| * | | | | | Merge pull request #10567 from ↵ | Rafael Mendonça França | 2013-05-11 | 3 | -1/+7 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | neerajdotname/read_attribute_before_type_cast_should_accept_symbol read_attribute_before_type_cast should accept symbol | |||||
| | * | | | | | read_attribute_before_type_cast should accept symbol | Neeraj Singh | 2013-05-11 | 3 | -1/+7 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #10572 from nertzy/dont-modify-options-hash-in-primary-key | Rafael Mendonça França | 2013-05-11 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Don't modify args in TableDefinition#primary_key | |||||
| * | | | | | | Merge pull request #10568 from siong1987/minor-refactoring | Xavier Noria | 2013-05-11 | 1 | -5/+0 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Clean up unused method for `rake doc`. | |||||
| | * | | | | | Clean up unused method for `rake doc`. | Teng Siong Ong | 2013-05-11 | 1 | -5/+0 | |
| |/ / / / / | ||||||
| * | | | | | Merge branch 'fix-json-encoding' | Rafael Mendonça França | 2013-05-10 | 3 | -5/+18 | |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | This is the compination of #10057 and 10534. Closes #10320 | |||||
| | * | | | | Give credits to all the envolved people [ci skip] | Rafael Mendonça França | 2013-05-10 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #10534 from cmaruz/master | Rafael Mendonça França | 2013-05-10 | 3 | -3/+12 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape of U+2028 and U+2029 in the JSON Encoder Conflicts: activesupport/lib/active_support/json/encoding.rb | |||||
| | | * | | | | Added escaping of U+2028 and U+2029 inside the json encoder. | Mario Caropreso | 2013-05-09 | 3 | -5/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U+2028 and U+2029 are allowed inside strings in JSON (as all literal Unicode characters) but JavaScript defines them as newline seperators. Because no literal newlines are allowed in a string, this causes a ParseError in the browser. We work around this issue by replacing them with the escaped version. The resulting JSON is still valid and can be parsed in the browser. This commit has been coauthored with Viktor Kelemen @yikulju | |||||
| | * | | | | | Fix syntax error on Ruby 2.0 | Rafael Mendonça França | 2013-05-10 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Ruby 2.0 is UTF-8 by default we need to explictly say that the encoding of this file is US-ASCII | |||||
| | * | | | | | Merge pull request #10057 from zackham/patch-1 | Rafael Mendonça França | 2013-05-10 | 1 | -2/+4 | |
| |/| | | | | | | | | | | | | | | | | | | | | | | | Escape multibyte line terminators in JSON encoding | |||||
| | * | | | | | 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 #10558 from Empact/cleanup-finder-methods | Rafael Mendonça França | 2013-05-10 | 4 | -28/+25 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Cleanup finder methods | |||||
| | * | | | | | | Extract JoinDependency#join_relation to DRY the repeated application of the ↵ | Ben Woosley | 2013-05-10 | 3 | -7/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #join_associations. | |||||
| | * | | | | | | In #apply_join_dependency, we can apply the #where in-place because relation ↵ | Ben Woosley | 2013-05-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is always a new object. Thanks to the #except we call at the top of the method. | |||||
| | * | | | | | | DRY-up join dependency creation by extracting construct_join_depdency | Ben Woosley | 2013-05-10 | 1 | -7/+5 | |
| | | | | | | | | ||||||
| | * | | | | | | Pull the excepts into apply_join_dependency, for the sake of DRY. | Ben Woosley | 2013-05-10 | 1 | -3/+4 | |
| | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |