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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	fix broken format in Array#to_sentence [ci skip]	Francesco Rodriguez	2013-04-04	1	-3/+5
\| \| \| \|
\| * \| \|	Merge branch 'master' of github.com:rails/rails	Vijay Dev	2013-03-30	31	-84/+178
\| \|\ \ \
\| * \| \| \|	Revert "Using American English spellings over British style spellings"	Vijay Dev	2013-03-30	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 573df1cf2a5d5d1f288c8a4a5d76194675141832. Reason: changelog edits aren't allowed in docrails. [ci skip]
* \| \| \| \|	Revert "Merge pull request #10158 from steveklabnik/issue_10125"	Rafael Mendonça França	2013-04-10	2	-19/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit fa3ef8e82ab2f96cf15ef9bc885b2468fad77621, reversing changes made to e0af93dd3a5eeee2e2a67b05f34afb66cc80c00b. Reason: Routes, Active Record and the rendering stack should not depend on the default locale
* \| \| \| \|	Using public send instead of send for the PerThreadRegistry module.	wangjohn	2013-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevents you from accidentally calling a protected method.
* \| \| \| \|	Removed unused setup	Anupam Choudhury	2013-04-10	1	-2/+0
\| \| \| \| \|
* \| \| \| \|	Fixed typo	Anupam Choudhury	2013-04-10	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #10158 from steveklabnik/issue_10125	Steve Klabnik	2013-04-09	2	-2/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix inflector to respect default locale.
\| * \| \| \| \|	Fix inflector to respect default locale.	Nick Cox	2013-04-10	2	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The inflector was made aware of locales in 7db0b073fec6bc3e6f213b58c76e7f43fcc2ab97, but it defaulted to :en. That should actually be our default locale instead. Fixes #10125
* \| \| \| \| \|	Changed the ScopeRegistry and the InstrumentationRegistry to use the	wangjohn	2013-04-09	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PerThreadRegistry module.
* \| \| \| \| \|	Creating a module so that per thread registries can be easily created as	wangjohn	2013-04-09	1	-0/+41
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	thread local variables.
* \| \| \| \|	Creating an object to consolidate thread locals which hold the	wangjohn	2013-04-08	1	-1/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	instrumenters for the AS::Notifications module.
* \| \| \| \|	Fix markdown formatting	Agis Anastasopoulos	2013-04-06	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Add option to Class#class_attribute for skipping the query method	Agis-	2013-04-06	3	-5/+18
\| \| \| \| \|
* \| \| \| \|	`fast_xs` support has been removed. Use 'String#encode(xml: :attr)`.	Aaron Patterson	2013-04-05	3	-19/+2
\| \| \| \| \|
* \| \| \| \|	Revert "Merge pull request #10034 from ↵	Rafael Mendonça França	2013-04-04	3	-33/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	benofsky/fix_skipping_object_callback_filters" This reverts commit c79c6980647eb76bfa52178711fb04ba7e9d403b, reversing changes made to ba4c27479add60b783a0e623c8a5d176c1dc9043. This broke all the tests. See https://travis-ci.org/rails/rails/builds/6061839
* \| \| \| \|	Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters	Rafael Mendonça França	2013-04-04	3	-1/+33
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fixes skipping object callback filters
\| * \| \| \| \|	Fixes skipping object callback filters	Ben McRedmond	2013-04-04	3	-1/+33
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows you to skip callbacks that are defined by objects, e.g. for `ActionController`: skip_after_filter MySpecialFilter Previously this didn't work due to a bug in how Rails compared callbacks in `Callback#matches?`. When a callback is compiled, if it's an object filter (i.e. not a method, proc, etc.), `Callback` now defines a method on `@klass` that is derived from the class name rather than `@callback_id`. So, when `skip_callback` tries to find the appropriate callback to remove, `Callback` can regenerate the method name for the filter object and return the correct value for `Callback#matches?`.
* \| \| \| \|	Further simplify enumerable group_by test	Carlos Antonio da Silva	2013-04-04	1	-3/+1
\| \| \| \| \|
* \| \| \| \|	Replaced inject with map	Anupam Choudhury	2013-04-04	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Removed unused comma after loop variable	Anupam Choudhury	2013-04-04	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #10080 from vipulnsward/railties_warning_fix_v2	Steve Klabnik	2013-04-03	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	add require to suppress warning; remove variable
\| * \| \| \| \|	add require to suppress warning; remove variable	Vipul A M	2013-04-04	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fixed Typo	Prathamesh Sonpatki	2013-04-04	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fix some railties test warnings	Vipul A M	2013-04-03	1	-3/+2
\|/ / / / /
* \| \| \| \|	Rename DummyKeyGenerator -> LegacyKeyGenerator	Trevor Turk	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
\| \|/ / / /
* / / / /	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]