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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	add `cached` key to `sql.active_record` event [ci skip]	yuuji.yaginuma	2016-10-02	1	-6/+7
* \| \| \|	Merge pull request #26672 from schpet/support_ruby_keywords_as_template_locals	Matthew Draper	2016-10-02	6	-1/+47
\|\ \ \ \
\| * \| \| \|	Change render to support any hash keys in locals	Peter Schilling	2016-10-02	6	-1/+47
\| \|/ / /
* \| \| \|	Merge pull request #26682 from matthewd/cable-tests	Matthew Draper	2016-10-02	5	-63/+96
\|\ \ \ \
\| * \| \| \|	Use websocket-client-simple instead of Faye as a websockets client	Matthew Draper	2016-10-02	3	-63/+87
\| * \| \| \|	Shut down EventMachine before re-enabling warnings	Matthew Draper	2016-10-02	2	-0/+9
* \| \| \| \|	Merge pull request #26677 from tbalthazar/26644	Andrew White	2016-10-01	3	-1/+30
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix `ActiveSupport::TimeWithZone#localtime`	Thomas Balthazar	2016-10-01	3	-1/+30
* \| \| \| \|	Merge pull request #26678 from larskanis/patch-1	Matthew Draper	2016-10-02	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Add missing require for zlib	Lars Kanis	2016-10-01	1	-0/+1
\|/ / / / /
* \| \| \| \|	Remove obsolete comment about class-level respond_to	Andrew White	2016-10-01	1	-2/+0
* \| \| \| \|	Merge pull request #26676 from matthewd/no-faye-mode	Matthew Draper	2016-10-01	15	-185/+8
\|\ \ \ \ \
\| * \| \| \| \|	In-line the configuration points that only existed for Faye support	Matthew Draper	2016-10-01	5	-13/+4
\| * \| \| \| \|	Remove Faye mode	Matthew Draper	2016-10-01	12	-175/+7
* \| \| \| \| \|	Make PG deadlock error more deterministic	Matthew Draper	2016-10-01	1	-9/+12
\|/ / / / /
* \| \| \| \|	Merge pull request #26547 from palkan/fix/actioncable-confirmation-race-condi...	Matthew Draper	2016-10-01	9	-24/+83
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Add Channel#ensure_confirmation_sent; call #subscribe_to_channel after initia...	palkan	2016-09-22	7	-33/+39
\| * \| \| \|	[Fix #25381] Avoid race condition on subscription confirmation	palkan	2016-09-20	6	-15/+60
* \| \| \| \|	Merge pull request #26675 from j1wilmot/update-docs	Jon Moss	2016-09-30	1	-1/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove dup distinct from AR query list [ci skip]	Jeremy Wilmot	2016-09-30	1	-1/+0
\|/ / / / /