aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into normalizecbAaron Patterson2013-05-1312-51/+97
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (61 commits) add tests for reset_calbacks Fixing build broken by this change Extract variable out of loop Updated comment to Rails 4 Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext better error message when app name is not passed in `rails new` Code cleanup for ActionDispatch::Flash#call Fix typo: require -> requires Add CHANGELOG entry for #10576 Merge pull request #10556 from Empact/deprecate-schema-statements-distinct Some editorial changes on the documentation. respond_to -> respond to in a message from AM::Lint specify that dom_(id|class) are deprecated in controllers, views are fine copy edits [ci skip] Fix class and method name typos Replace multi_json with json ruby -> Ruby Adding documentation to the automatic inverse_of finder. Improve CHANGELOG entry [ci kip] Call assume_migrated_upto_version on connection ... Conflicts: activesupport/lib/active_support/callbacks.rb
| * add tests for reset_calbacksAaron Patterson2013-05-131-0/+40
| |
| * Fixes NoMethodError: `alias_method_chain` when requiring just ↵Andy Lindeman2013-05-122-0/+4
| | | | | | | | | | | | active_support/core_ext * Each file that uses `alias_method_chain` brings it in explicitly
| * Fix typo: require -> requiresRafael Mendonça França2013-05-121-1/+1
| | | | | | | | [ci skip]
| * Add CHANGELOG entry for #10576Rafael Mendonça França2013-05-121-0/+7
| | | | | | | | [ci skip]
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-124-2/+11
| |\ | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| | * added docs for InheritedOptions class [ci skip]Anton Kalyaev2013-05-111-0/+8
| | |
| | * changed rails -> Rails at two placesaditya-kapoor2013-05-092-2/+2
| | |
| | * Changed spelling of Busines to Businessaditya-kapoor2013-05-081-1/+1
| | |
| | * replace apostrophe with backquote for matching [ci skip]Anton Kalyaev2013-05-031-2/+2
| | |
| | * document String#to_time exceptionVipul A M2013-05-021-0/+1
| | |
| * | Replace multi_json with jsonErik Michaels-Ober2013-05-113-45/+18
| | |
| * | Give credits to all the envolved people [ci skip]Rafael Mendonça França2013-05-101-1/+1
| | |
| * | Merge pull request #10534 from cmaruz/masterRafael Mendonça França2013-05-103-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 Caropreso2013-05-093-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.0Rafael Mendonça França2013-05-101-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-1Rafael Mendonça França2013-05-101-2/+4
| |\ \ \ | | | | | | | | | | | | | | | Escape multibyte line terminators in JSON encoding
| | * | | Escape multibyte line terminators in JSON encodingzackham2013-04-021-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?
* | | | | do not keep a reference to the chain in the callback objectsAaron Patterson2013-05-101-12/+10
| | | | |
* | | | | fix deprecation testAaron Patterson2013-05-101-0/+2
| | | | |
* | | | | push merge code to the callback itselfAaron Patterson2013-05-101-18/+10
| | | | |
* | | | | dup the callback and set the chainAaron Patterson2013-05-101-8/+8
| | | | |
* | | | | remove klass because it is not usedAaron Patterson2013-05-101-9/+7
| | | | |
* | | | | rename instance variablesAaron Patterson2013-05-101-12/+14
| | | | |
* | | | | push duplicates? logic to the instanceAaron Patterson2013-05-101-16/+7
| | | | |
* | | | | callback chain is in charge of the cache, so remove method based cacheAaron Patterson2013-05-101-21/+0
| | | | |
* | | | | __define_callbacks method is not necessary anymoreAaron Patterson2013-05-101-8/+1
| | | | |
* | | | | just run compiled callbacks since they are cachedAaron Patterson2013-05-101-14/+4
| | | | |
* | | | | cache compiled callbacksAaron Patterson2013-05-101-7/+27
| | | | |
* | | | | use delegation over inheritance so we can figure when to cache / bust cacheAaron Patterson2013-05-101-5/+22
| | | | |
* | | | | fixing activemodel testsAaron Patterson2013-05-101-1/+2
| | | | |
* | | | | use an environment object to hold state about the filter callsAaron Patterson2013-05-101-21/+41
| | | | |
* | | | | object based callbacks cannot be duplicatedAaron Patterson2013-05-101-7/+4
| | | | |
* | | | | pass the run block as a normal variable to the rest of the callbacksAaron Patterson2013-05-101-12/+12
| | | | |
* | | | | fixing more variable namesAaron Patterson2013-05-101-10/+10
| | | | |
* | | | | fix variable nameAaron Patterson2013-05-101-6/+6
| | | | |
* | | | | reduce the number of lambasAaron Patterson2013-05-101-5/+2
| | | | |
* | | | | callback sequence is no longer usedAaron Patterson2013-05-101-6/+0
| | | | |
* | | | | no need for variable assignments, just pass the values inAaron Patterson2013-05-101-6/+2
| | | | |
* | | | | make_lambda is never called with an ArrayAaron Patterson2013-05-101-2/+0
| | | | |
* | | | | callbacks are wrapped with lambdasAaron Patterson2013-05-101-106/+76
| | | | |
* | | | | remove dead codeAaron Patterson2013-05-101-10/+0
| | | | |
* | | | | fix method namesAaron Patterson2013-05-101-40/+44
| | | | |
* | | | | using lambas for the callback bodiesAaron Patterson2013-05-101-32/+12
| | | | |
* | | | | wrap all options in lambasAaron Patterson2013-05-101-7/+13
| | | | |
* | | | | conditions in callbacks return consistent lambdasAaron Patterson2013-05-101-9/+43
|/ / / /
* | | | Merge pull request #10535 from vipulnsward/remove_varCarlos Antonio da Silva2013-05-091-1/+0
|\ \ \ \ | | | | | | | | | | remove redundant var
| * | | | remove redundant varVipul A M2013-05-091-1/+0
| | | | |
* | | | | Merge pull request #10531 from waseem/refactor_requireCarlos Antonio da Silva2013-05-091-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Require different core extensions correctly.
| * | | | | Require different core extensions correctly.Waseem Ahmad2013-05-091-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The begin rescue block is specifically to catch LoadError while loading i18n gem. Other core extensions, under active support, should be required outside of the begin rescue block.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 16:38:24 +0000