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

	Commit message (Expand)	Author	Age	Files	Lines
*	Upgrade to listen 3.0.5, re-enable tests	Godfrey Chan	2015-11-26	4	-16/+5
*	Merge pull request #22415 from kamipo/prepared_statements_for_mysql2_adapter	Sean Griffin	2015-11-26	6	-154/+152
\|\
\| *	Add prepared statements support for `Mysql2Adapter`	Ryuta Kamizono	2015-11-26	6	-154/+152
* \|	Merge pull request #22263 from mastahyeti/csrf-origin-check	Rafael França	2015-11-26	5	-4/+81
\|\ \
\| * \|	Add option to verify Origin header in CSRF checks	Ben Toews	2015-11-25	5	-4/+81
* \| \|	Merge pull request #22411 from jaredbeck/doc_ar_joins	Yves Senn	2015-11-26	1	-2/+22
\|\ \ \
\| * \| \|	Docs: ActiveRecord::QueryMethods#joins	Jared Beck	2015-11-25	1	-2/+22
\| \| \|/ \| \|/\|
* / \|	Only run listen tests in isolation, for now	Godfrey Chan	2015-11-26	2	-1/+21
\|/ /
* \|	Merge pull request #22401 from cllns/remove-br-from-scaffold	Kasper Timm Hansen	2015-11-25	2	-3/+7
\|\ \
\| * \|	Remove <br> from scaffold, in favor of using CSS	Sean Collins	2015-11-25	2	-3/+7
* \| \|	Merge pull request #22290 from y-yagi/donot_show_test_unit_job	Eileen M. Uchitelle	2015-11-25	1	-0/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	do not show Active Job test generator	yuuji.yaginuma	2015-11-14	1	-0/+1
* \| \|	Merge pull request #22399 from wjessop/remove_unused_code	Eileen M. Uchitelle	2015-11-24	1	-4/+1
\|\ \ \
\| * \| \|	Remove unused code	Will Jessop	2015-11-24	1	-4/+1
\|/ / /
* \| \|	Merge pull request #22348 from kv109/22233_without_deprecation	Andrew White	2015-11-24	1	-1/+2
\|\ \ \
\| * \| \|	Fix wrong timezone mapping for Switzerland [22233]	Kacper Walanus	2015-11-15	1	-1/+2
* \| \| \|	Merge pull request #22370 from yui-knk/remove_blank_line	Andrew White	2015-11-24	1	-1/+0
\|\ \ \ \
\| * \| \| \|	Remove a blank line from a template for plugin `routes.rb`	yui-knk	2015-11-22	1	-1/+0
* \| \| \| \|	Merge pull request #22304 from kamipo/schema_dumping_support_for_postgresql_g...	Yves Senn	2015-11-24	4	-104/+161
\|\ \ \ \ \
\| * \| \| \| \|	Add schema dumping support for PostgreSQL geometric data types	Ryuta Kamizono	2015-11-24	3	-11/+77
\| * \| \| \| \|	Move `migration/postgresql_geometric_types_test.rb` in `adapters/postgresql/g...	Ryuta Kamizono	2015-11-24	2	-93/+84
* \| \| \| \| \|	Merge pull request #22214 from kamipo/not_passing_native_database_types_to_ta...	Rafael França	2015-11-24	4	-15/+6
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Not passing `native_database_types` to `TableDefinition`	Ryuta Kamizono	2015-11-08	4	-15/+6
* \| \| \| \| \| \|	Merge pull request #22172 from tijmenb/fix-source-in-show-exception	Rafael França	2015-11-24	3	-0/+16
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add text template for source code	Tijmen Brommet	2015-11-03	3	-0/+16
* \| \| \| \| \| \| \|	Move all nodoc methods to the private section	Rafael Mendonça França	2015-11-24	1	-43/+43
* \| \| \| \| \| \| \|	Put all private method together	Rafael Mendonça França	2015-11-24	1	-36/+35
* \| \| \| \| \| \| \|	Avoid mutating the headers hash	Rafael Mendonça França	2015-11-24	1	-2/+3
* \| \| \| \| \| \| \|	nodoc in the private method	Rafael Mendonça França	2015-11-24	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #22120 from hnatt/refactor-actionmailer	Rafael Mendonça França	2015-11-24	1	-55/+59
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Rename ActionMailer::Base#class_from_value -> observer_class_for	hnatt	2015-10-30	1	-4/+4
\| * \| \| \| \| \| \| \|	Don't mutate headers in ActionMailer::Base#collect_responses_from_templates	hnatt	2015-10-30	1	-2/+2
\| * \| \| \| \| \| \| \|	Pass message as argument to ActionMailer::Base#assign_headers_to_message	hnatt	2015-10-30	1	-4/+5
\| * \| \| \| \| \| \| \|	Fix indentation in ActionMailer::Base#collect_responses_from_templates	hnatt	2015-10-29	1	-5/+5
\| * \| \| \| \| \| \| \|	Refactor out headers to message assignment from ActionMailer::Base#mail	hnatt	2015-10-29	1	-3/+6
\| * \| \| \| \| \| \| \|	Use attr_internal in ActionMailer::Base#mail instead of local var for message	hnatt	2015-10-29	1	-11/+9
\| * \| \| \| \| \| \| \|	Refactor out defaults handling from ActionMailer::Base#mail	hnatt	2015-10-29	1	-9/+15
\| * \| \| \| \| \| \| \|	Refactor ActionMailer::Base#collect_responses	hnatt	2015-10-29	1	-16/+16
\| * \| \| \| \| \| \| \|	Reduce code duplication in ActionMailer::Base#register_observer and #register...	hnatt	2015-10-29	1	-16/+12
* \| \| \| \| \| \| \| \|	Merge pull request #22287 from dharamgollapudi/patch-2	Rafael França	2015-11-24	1	-2/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Move the desc one level up	Dharam Gollapudi	2015-11-13	1	-2/+1
* \| \| \| \| \| \| \| \| \|	Merge pull request #22390 from jacobbednarz/update-valgrind-docs-for-macosx-s...	Rafael França	2015-11-23	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Remove valgrind note about linux only support	Jacob Bednarz	2015-11-24	1	-2/+2
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #22272 from y-yagi/remove_test_files_in_plugin_gemspec	Eileen M. Uchitelle	2015-11-23	1	-3/+0
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	don't package test files in plugin gemspec	yuuji.yaginuma	2015-11-12	1	-3/+0
* \| \| \| \| \| \| \| \| \| \|	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