rails.git - Mirror of official rails repo with custom fixes.

	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 #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
\| \|
* \|	Added missing assert	Anupam Choudhury	2013-04-02	6	-25/+37
\|/
*	Merge pull request #9997 from vipulnsward/hash_destructive_merge	Carlos Antonio da Silva	2013-03-30	2	-2/+2
\|\ \| \| \| \|	Change merge to merge! to avoid creating new objects
\| *	change merge to merge!	Vipul A M	2013-03-29	2	-2/+2
\| \|
* \|	Merge pull request #10007 from vipulnsward/fix_AS_typos	Carlos Antonio da Silva	2013-03-30	3	-14/+14
\|\ \ \| \| \| \| \| \|	Fix some typos in AS
\| * \|	fix some typos in AS	Vipul A M	2013-03-30	3	-14/+14
\| \|/
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-03-30	2	-4/+4
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip]
\| *	Fix some typos	Akira Matsuda	2013-03-25	1	-1/+1
\| \|
\| *	Using American English spellings over British style spellings	Prathamesh Sonpatki	2013-03-21	1	-3/+3
\| \|
* \|	determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn]	Xavier Noria	2013-03-28	2	-0/+12
\| \|
* \|	Merge pull request #9523 from ↵	Rafael Mendonça França	2013-03-27	4	-2/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stopdropandrew/Instrumenter#instrument-yields-payload ActiveSupport::Notifications::Instrumenter#instrument should yield Conflicts: activesupport/CHANGELOG.md
\| * \|	ActiveSupport::Notifications::Instrumenter#instrument should yield	stopdropandrew	2013-03-02	4	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \|	its payload the same way that ActiveSupport::Notifications does. Fix spelling in test name.
* \| \|	Fixed timezone mapping of Ulaanbaatar.	Zolzaya	2013-03-27	1	-1/+1
\| \| \|
* \| \|	Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.	kennyj	2013-03-26	1	-1/+1
\| \| \|
* \| \|	Updated docs due to removal of serializer accessor	Albert Lash	2013-03-24	1	-3/+3
\| \| \|
* \| \|	Merge pull request #8501 from charliesome/version-to-s	Rafael Mendonça França	2013-03-23	1	-6/+7
\|\ \ \ \| \| \| \| \| \| \| \|	Add #to_s method to VERSION modules
\| * \| \|	Add version method to top level modules	Charlie Somerville	2013-03-21	1	-6/+7
\| \| \| \|
* \| \| \|	Tidying up some require : removing useless sort and homogenizing with the ↵	Intrepidd	2013-03-20	1	-2/+2
\|/ / / \| \| \| \| \| \| \| \| \|	rest of the code the wat the includes are done
* \| \|	remove unused payloads in blocks in caching instrumentation	Vipul A M	2013-03-19	1	-3/+3
\| \| \|
* \| \|	Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def'	kennyj	2013-03-19	1	-1/+1
\| \| \|
* \| \|	Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"	Xavier Noria	2013-03-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
* \| \|	instruct RDoc to only parse Ruby files under lib [Fixes #9779]	Xavier Noria	2013-03-18	1	-1/+1
\| \| \|
* \| \|	Merge branch 'master-sec'	Aaron Patterson	2013-03-18	5	-2/+45
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854]
\| * \| \|	JDOM XXE Protection [CVE-2013-1856]	Ben Murphy	2013-03-15	5	-2/+45
\| \| \| \|
* \| \| \|	Merge pull request #9774 from ↵	Andrew White	2013-03-18	3	-0/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	senny/9772_reraise_no_method_error_in_proper_context `TimeWithZone` raises `NoMethodError` in proper context.
\| * \| \| \|	`TimeWithZone` raises `NoMethodError` in proper context.	Yves Senn	2013-03-18	3	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #9772. `TimeWithZone` delegates everything to the wrapped `Time` object using `method_missing`. The result is that `NoMethodError` error will be raised in the context of `Time` which leads to a misleading debug output.
* \| \| \| \|	fix repeat of test; remove unused variable by use of each_key	Vipul A M	2013-03-18	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #9757 from vipulnsward/remove_message_param	Carlos Antonio da Silva	2013-03-17	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	remove unused parameter passed to assert_query_equal method
\| * \| \| \|	remove unused parameter passed to assert_query_equal method	Vipul A M	2013-03-17	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #9758 from vipulnsward/remove_from_rakefile	Carlos Antonio da Silva	2013-03-17	1	-2/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra lines from Rakefile, which threw warning
\| * \| \| \| \|	extra lines from Rakefile removed, which also threw warning	Vipul A M	2013-03-17	1	-2/+0
\| \|/ / / /
* / / / /	refactor test to drop unnecessary hash creation, test directly instead	Vipul A M	2013-03-17	1	-16/+10
\|/ / / /
* \| \| \|	Revert "Merge pull request #8156 from fredwu/acronym_fix-master"	Steve Klabnik	2013-03-16	3	-8/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 867dc1700f32aae6f98c4651bd501597e6b52bc0, reversing changes made to 9a421aaa8285cf2a7ecb1af370748b0337818930. This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065 Please see comments on #8156 for some discussion.
* \| \| \|	revises the CHANGELOG entry from 26aa265 [ci skip]	Xavier Noria	2013-03-16	1	-2/+3
\| \| \| \|
* \| \| \|	Added Inflector#underscore fix to the changelog	Fred Wu	2013-03-17	1	-0/+4
\| \| \| \|
* \| \| \|	Fixed a bug where the inflector would replace camelCase strings and ↵	Fred Wu	2013-03-17	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	disregarding specified acronyms, fixes #8015
* \| \| \|	Revert "make new rails apps log to STDOUT"	Steve Klabnik	2013-03-15	2	-19/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit b7d9d6e2cd5082d269dafbc0316e2107febe1451. Per discussion with @jeremy and @rubys on Campfire.
* \| \| \|	make new rails apps log to STDOUT	Terence Lee	2013-03-15	2	-0/+19
\| \| \| \|
* \| \| \|	Add regression tests for #9678	Andrew White	2013-03-13	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The bug with `ActiveSupport::TimeZone.parse` described in #9678 was unwittingly fixed in 005d910 so add some tests to prevent regression.
* \| \| \|	removing out of date comment. ↵	Aaron Patterson	2013-03-12	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	:heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart: @pixeltrix
* \| \| \|	drop memory consumption and startup speed by switching to define_method	Aaron Patterson	2013-03-12	1	-23/+28
\| \| \| \|
* \| \| \|	Remove manual "return true" from AS::TZ match method	Carlos Antonio da Silva	2013-03-12	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #9681 from vipulnsward/fix_typo_in_module_name	Carlos Antonio da Silva	2013-03-12	4	-7/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix typo in DependenciesTestHelpers module name
\| * \| \| \|	Fix typo in DependenciesTestHelpers module name	Vipul A M	2013-03-12	4	-7/+7
\| \| \| \| \|
* \| \| \| \|	Cleanup tests for unused variables	Vipul A M	2013-03-11	2	-3/+1
\|/ / / /
* \| \| \|	Fixed tests for returning an instance of `Time` in the local system timezone.	Paul Nikitochkin	2013-03-10	1	-5/+5
\| \| \| \|
* \| \| \|	included "Montevideo" in list of time zone aliases (closes Issue #9628)	Gernot	2013-03-09	1	-0/+1
\| \|_\|/ \|/\| \|
* \| \|	CHANGELOG entry for improved singularizing of singulars.	Yves Senn	2013-03-06	1	-1/+14
\|/ / \| \| \| \| \| \| \| \| \| \|	Closes #9559. The actual patch was added with #4719