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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #22388 from kamipo/set_field_encoding_is_only_needed_for_m...	Sean Griffin	2015-11-23	3	-9/+8
\|\
\| *	`set_field_encoding` is only needed for `MysqlAdapter`	Ryuta Kamizono	2015-11-24	3	-9/+8
* \|	Fix more test failures caused by #21000	Sean Griffin	2015-11-23	1	-1/+5
* \|	Fix test failures caused by #21000	Sean Griffin	2015-11-23	1	-0/+1
* \|	Revert "Merge pull request #18446 from cloud8421/actionmailer-unregister-inte...	Sean Griffin	2015-11-23	4	-137/+19
* \|	Merge pull request #21000 from twalpole/find_or_parameter_issues	Sean Griffin	2015-11-23	7	-44/+101
\|\ \
\| * \|	Update and fix forbidden attributes tests	Thomas Walpole	2015-11-03	7	-44/+101
* \| \|	Merge pull request #22385 from headius/each_object_singleton_test	Sean Griffin	2015-11-23	1	-2/+3
\|\ \ \
\| * \| \|	Test if each_object(singleton_class) works, since JRuby added it.	Charles Oliver Nutter	2015-11-23	1	-2/+3
* \| \| \|	Merge pull request #17013 from gsamokovarov/fix-null-resolver	Sean Griffin	2015-11-23	1	-2/+1
\|\ \ \ \
\| * \| \| \|	Fix improper value types used to instantiate a Template in AV::NullResolver	Genadi Samokovarov	2014-09-22	1	-2/+1
* \| \| \| \|	Merge pull request #17928 from sergey-alekseev/remove-unused-form-data-method	Sean Griffin	2015-11-23	2	-3/+29
\|\ \ \ \ \
\| * \| \| \| \|	write a test for `#form_data?`	Sergey Alekseev	2015-03-31	2	-1/+29
* \| \| \| \| \|	Merge pull request #18446 from cloud8421/actionmailer-unregister-interceptor	Sean Griffin	2015-11-23	4	-19/+137
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	ActionMailer::Base can unregister interceptor(s).	Claudio Ortolina	2015-01-31	4	-19/+136
* \| \| \| \| \|	Merge pull request #22372 from greysteil/clearer-ip-spoofing-comment	Richard Schneeman	2015-11-23	1	-7/+15
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Clearer comment and variable name on IP spoofing	Grey Baker	2015-11-22	1	-7/+15
* \| \| \| \| \| \|	Remove blanket array delegation from `Relation`	Sean Griffin	2015-11-23	2	-20/+2
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #22374 from DNNX/patch-1	Rafael França	2015-11-23	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Simplify `RailsGuides::Generator#select_only` a bit	Viktar Basharymau	2015-11-22	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #22379 from yui-knk/translating_rails_guides	Rafael França	2015-11-23	1	-0/+36
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] Add `Translating Rails Guides` to contributing_to_ruby_on_rails	yui-knk	2015-11-23	1	-0/+36
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #22380 from wjessop/fix_race_in_aj_integration_tests	Sean Griffin	2015-11-23	3	-7/+18
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Fix race condition testing for job execution order	Will Jessop	2015-11-23	3	-7/+18
\|/ / / / / /
* \| \| \| \| \|	Bring back `===` stubbing in `time_zone_select` test.	Kasper Timm Hansen	2015-11-22	1	-1/+7
* \| \| \| \| \|	Ditch `each_with_index` for `each`.	Kasper Timm Hansen	2015-11-22	1	-1/+1
* \| \| \| \| \|	Don't cache fake time zones.	Kasper Timm Hansen	2015-11-22	1	-8/+9
* \| \| \| \| \|	Merge pull request #21615 from ronakjangir47/actionViewpart2	Kasper Timm Hansen	2015-11-22	5	-79/+133
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Removed Mocha from Action View	Ronak Jangir	2015-09-23	5	-79/+133
* \| \| \| \| \|	removes the mutex around `changed`	Xavier Noria	2015-11-22	1	-7/+2
* \| \| \| \| \|	reset the @updated flag before the callback invocation	Xavier Noria	2015-11-21	1	-2/+1
* \| \| \| \| \|	make the @updated flag atomic in the evented monitor	Xavier Noria	2015-11-21	1	-5/+11
* \| \| \| \| \|	Merge pull request #22333 from harrykiselev/patch-3	Yves Senn	2015-11-21	1	-1/+5
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Update dirty.rb: documentation fix.	Harry V. Kiselev	2015-11-19	1	-1/+5
* \| \| \| \| \| \|	Merge pull request #22362 from radar/toggle-documentation	Claudio B	2015-11-20	1	-0/+8
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add example for AR::Persistence#toggle	Ryan Bigg	2015-11-21	1	-0/+8
* \| \| \| \| \| \| \|	Merge pull request #22353 from Bounga/doc_for_cookies_encrypted	Claudio B	2015-11-20	1	-0/+7
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add missing example for cookies.encrypted [ci skip]	Nicolas Cavigneaux	2015-11-20	1	-0/+7
* \| \| \| \| \| \| \| \|	Merge pull request #22354 from nishantmodak/image-tag-data-attributes	Rafael França	2015-11-20	2	-1/+4
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Example of setting data attributes for image_tag	Nishant Modak	2015-11-20	2	-1/+4
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #22355 from yui-knk/remove_arity_check	Kasper Timm Hansen	2015-11-20	2	-10/+0
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove arity check for `RouteSet#draw`	yui-knk	2015-11-21	2	-10/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #22332 from grosser/grosser/deprecation	Rafael França	2015-11-20	6	-4/+72
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	add deprecations for a smooth transition after #22215	Michael Grosser	2015-11-19	6	-4/+72
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #22347 from kamipo/fix_test_index_in_create	Sean Griffin	2015-11-19	2	-6/+6
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix test failure in `adapters/mysql/active_schema_test.rb`	Ryuta Kamizono	2015-11-20	2	-6/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Revert "Allow specifying the default table options for mysql adapters"	Sean Griffin	2015-11-19	3	-26/+1
* \| \| \| \| \| \| \|	Allow specifying the default table options for mysql adapters	Sean Griffin	2015-11-19	3	-1/+26
* \| \| \| \| \| \| \|	Merge pull request #22336 from tjschuck/enumerable_sum_perf	Kasper Timm Hansen	2015-11-19	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Change Enumerable#sum to use inject(:sym) specification	T.J. Schuck	2015-11-19	1	-1/+1
\| \|/ / / / / / /