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

	Commit message (Expand)	Author	Age	Files	Lines
*	Undefine assings in IntegrationTest	Rafael Mendonça França	2016-10-07	2	-0/+10
*	Merge pull request #26730 from rails/explain-why-inverse_of-is-disabled	Xavier Noria	2016-10-07	1	-0/+4
\|\
\| *	explain why autosave= disables inverse_of [ci skip]	Xavier Noria	2016-10-07	1	-0/+4
* \|	Tweak a test so the queries match	Matthew Draper	2016-10-08	1	-1/+1
\|/
*	Simplify serializable test to avoid mystery deadlock	Matthew Draper	2016-10-07	1	-23/+21
*	Merge pull request #26714 from matthewd/close-race	Matthew Draper	2016-10-07	6	-15/+22
\|\
\| *	Wait for the socket to be closed asynchronously	Matthew Draper	2016-10-06	1	-2/+10
\| *	Use a branch of websocket-client-simple, to work around read/close race	Matthew Draper	2016-10-06	3	-12/+11
\| *	Close the IO from the read loop thread	Matthew Draper	2016-10-06	2	-1/+1
* \|	Merge pull request #24963 from fertapric/recover-db-runtime-on-production-logs	Eileen M. Uchitelle	2016-10-06	1	-2/+1
\|\ \
\| * \|	Fix DB runtimes on production log	Fernando Tapia Rico	2016-05-11	1	-2/+1
* \| \|	Merge pull request #26631 from kamipo/remove_duplicate_condition	Matthew Draper	2016-10-06	1	-3/+1
\|\ \ \
\| * \| \|	Remove duplicated `unless current_adapter?(:SQLite3Adapter)` condition	Ryuta Kamizono	2016-09-27	1	-3/+1
* \| \| \|	Merge pull request #26633 from kamipo/text_too_big_should_be_text	Matthew Draper	2016-10-06	1	-1/+1
\|\ \ \ \
\| * \| \| \|	`:text_too_big` column should be `:text`, not `:integer`	Ryuta Kamizono	2016-09-27	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #25304 from kbrock/calculate_attributes	Matthew Draper	2016-10-06	1	-6/+2
\|\ \ \ \
\| * \| \| \|	Use attribute_names over column_names	Keenan Brock	2016-10-04	1	-6/+2
* \| \| \| \|	Merge pull request #26359 from maclover7/jm-speed-up-time	Matthew Draper	2016-10-06	1	-0/+2
\|\ \ \ \ \
\| * \| \| \| \|	Speed up Time.zone.now	Jon Moss	2016-10-02	1	-0/+2
* \| \| \| \| \|	Merge pull request #26710 from kenta-s/change-page-change-to-turbolinks-load	Jon Moss	2016-10-05	2	-2/+2
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	Change page:change to turbolinks:load in README.md [ci skip]	kenta-s	2016-10-05	2	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #24571 from raimo/patch-1	Sean Griffin	2016-10-04	3	-1/+24
\|\ \ \ \ \
\| * \| \| \| \|	Print the proper ::Float::INFINITY value when used as a default value	Raimo Tuisku	2016-05-23	3	-1/+24
* \| \| \| \| \|	Merge pull request #26684 from matthewd/executor-serial	Matthew Draper	2016-10-05	5	-19/+87
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Avoid bumping the class serial when invoking executor	Matthew Draper	2016-10-03	5	-19/+87
* \| \| \| \| \| \|	Merge pull request #26686 from matthewd/deprecation-caller	Matthew Draper	2016-10-05	1	-0/+13
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Correct caller tracking in delegated deprecation methods	Matthew Draper	2016-10-03	1	-0/+13
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #26693 from iainbeeston/consistently-use-activerecord-attr...	Andrew White	2016-10-04	8	-9/+23
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Made ActiveRecord consistently use ActiveRecord::Type (not	Iain Beeston	2016-10-03	8	-9/+23
* \| \| \| \| \| \|	Merge pull request #26701 from kamipo/restore_gemfile_lock_entries	Andrew White	2016-10-04	1	-0/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Restore missing Gemfile.lock entries	Ryuta Kamizono	2016-10-04	1	-0/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #26699 from Neodelf/request_id	Jon Moss	2016-10-03	1	-3/+4
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci-skip] Swap method and its alias, format doc	Andrey Molchanov	2016-10-04	1	-3/+4
* \| \| \| \| \| \| \|	Don't shut down adapters that haven't been set	Matthew Draper	2016-10-04	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #26695 from MentalPower/master	Eileen M. Uchitelle	2016-10-03	5	-22/+27
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Allow the use of listen's 3.1.x branch.	Esteban Santana Santana	2016-10-03	5	-22/+27
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #26555 from chriscarter90/unmatched-constraint-routing-mes...	Andrew White	2016-10-03	5	-9/+23
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Show an "unmatched constraints" error for mismatching and present params	Chris Carter	2016-10-03	5	-9/+23
\|/ / / / / /
* \| \| \| \| \|	Temporarily make ACa tests noiser and more predictable	Matthew Draper	2016-10-03	1	-1/+1
* \| \| \| \| \|	Merge pull request #26425 from prathamesh-sonpatki/fix-nil-issue	Matthew Draper	2016-10-03	2	-10/+19
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix issue with `cache_key` when the named timestamp column has value nil	Prathamesh Sonpatki	2016-09-07	2	-10/+19
* \| \| \| \| \| \|	Shut down the worker pool - don't kill it	Matthew Draper	2016-10-03	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #26620 from maclover7/jm-ac-pg-bug	Matthew Draper	2016-10-03	2	-2/+39
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add tests for Server::Base#restart	Jon Moss	2016-10-02	1	-0/+33
\| * \| \| \| \| \| \|	Move behavior to Server::Base, and flush pubsub	Jon Moss	2016-10-02	2	-3/+6
\| * \| \| \| \| \| \|	Shutdown pubsub connection before classes are reloaded	Jon Moss	2016-10-02	1	-0/+1
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Cache to_time to improve performance when comparing	Andrew White	2016-10-02	1	-1/+5
* \| \| \| \| \| \|	Revert "Merge pull request #25880 from ryandv/fix_performance_regression_in_t...	Andrew White	2016-10-02	1	-1/+1
* \| \| \| \| \| \|	Revert "Merge pull request #26677 from tbalthazar/26644"	Andrew White	2016-10-02	3	-30/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #26683 from y-yagi/add_cached_key_to_sql_active_record_event	Jon Moss	2016-10-02	1	-6/+7
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|