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

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove deprecated set_cache_value	Andrew White	2016-11-13	2	-17/+0
*	Remove deprecated escape_key	Andrew White	2016-11-13	2	-14/+0
*	Remove deprecated key_file_path	Andrew White	2016-11-13	2	-14/+0
*	Minor corrections to #26905	Andrew White	2016-11-13	2	-2/+2
*	Fix typo in constant reference	Andrew White	2016-11-13	1	-1/+1
*	It's a NAN not Infinity	Andrew White	2016-11-13	1	-1/+1
*	Use literal values in assertions	Andrew White	2016-11-13	1	-6/+4
*	Merge pull request #26933 from prathamesh-sonpatki/fix-26877	Andrew White	2016-11-13	2	-1/+23
\|\
\| *	Fix an issue with JSON encoding of "Infinity" and "NaN" values	Prathamesh Sonpatki	2016-10-30	2	-1/+23
* \|	Merge pull request #27024 from vipulnsward/changelog-edits	Andrew White	2016-11-13	4	-15/+15
\|\ \
\| * \|	Changelog edits	Vipul A M	2016-11-12	4	-15/+15
* \| \|	Merge pull request #26905 from bogdanvlviv/docs	Andrew White	2016-11-13	42	-75/+77
\|\ \ \
\| * \| \|	Add missing `+` around a some literals.	bogdanvlviv	2016-10-27	42	-75/+77
* \| \| \|	removes unconventional "then" in case expression	Xavier Noria	2016-11-13	1	-1/+1
* \| \| \|	revises style in recent code (of mine)	Xavier Noria	2016-11-13	1	-5/+7
* \| \| \|	Merge pull request #27019 from djpowers/patch-1	Jon Moss	2016-11-12	2	-3/+3
\|\ \ \ \
\| * \| \| \|	Fix spelling in API docs	Dave Powers	2016-11-12	2	-3/+3
* \| \| \| \|	Add test for #25248	Sean Griffin	2016-11-12	1	-0/+10
* \| \| \| \|	Merge pull request #25248 from bluesh55:features/skip-coffee	Sean Griffin	2016-11-12	1	-1/+6
\|\ \ \ \ \
\| * \| \| \| \|	Add --skip-coffee generating option	seunghwan oh	2016-06-02	1	-1/+6
* \| \| \| \| \|	Merge pull request #27022 from kamipo/add_nodoc_to_table_structure	Andrew White	2016-11-12	1	-9/+2
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	Add `:nodoc` to `table_structure`	Ryuta Kamizono	2016-11-12	1	-9/+2
* \| \| \| \| \|	significant speedup of AC::Parameters#permit	Xavier Noria	2016-11-12	2	-1/+8
\|/ / / / /
* \| \| \| \|	Merge pull request #27018 from alexanderkustov/alexanderkustov/update-docs-Ac...	Vipul A M	2016-11-11	1	-0/+12
\|\ \ \ \ \
\| * \| \| \| \|	better docs for ActionView::ViewPaths#prepend_view_path	Alexander Kustov	2016-11-12	1	-0/+12
* \| \| \| \| \|	adds a missing dot [ci skip]	Xavier Noria	2016-11-11	1	-1/+1
* \| \| \| \| \|	adds support for arbitrary hashes in strong parameters	Xavier Noria	2016-11-11	4	-3/+101
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #27008 from kirs/new-column-from-field	Rafael França	2016-11-11	4	-38/+48
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Refactor column initialization into `new_column_from_field`	Kir Shatrov	2016-11-11	4	-38/+48
\|/ / / /
* \| \| \|	Merge pull request #26978 from matthewd/query-cache-pool	Matthew Draper	2016-11-10	4	-4/+73
\|\ \ \ \
\| * \| \| \|	Configure query caching (per thread) on the connection pool	Matthew Draper	2016-11-06	4	-2/+71
\| * \| \| \|	Try harder to avoid making a connection while releasing it	Matthew Draper	2016-11-06	1	-2/+2
* \| \| \| \|	Merge pull request #27006 from bogdanvlviv/ar_querying_guide	Jon Moss	2016-11-10	1	-0/+3
\|\ \ \ \ \
\| * \| \| \| \|	Update guides/source/active_record_querying.md	bogdanvlviv	2016-11-10	1	-0/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #26820 from y-yagi/add_bang_merge_to_parameters	Rafael França	2016-11-10	3	-0/+28
\|\ \ \ \ \
\| * \| \| \| \|	add `ActionController::Parameters#merge!`	yuuji.yaginuma	2016-10-18	3	-0/+28
* \| \| \| \| \|	Mysql2::Client::FOUND_ROWS should be defined in all currently supported versi...	Akira Matsuda	2016-11-10	1	-6/+4
* \| \| \| \| \|	Merge pull request #26988 from Paxa/connection_pool_stat	Rafael França	2016-11-08	3	-0/+47
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add ActiveRecord::Base.connection_pool.stat	Pavel	2016-11-09	3	-0/+47
* \| \| \| \| \| \|	[ci skip] Expand context on `:cache_hits`.	Kasper Timm Hansen	2016-11-08	1	-5/+7
* \| \| \| \| \| \|	Merge pull request #26993 from yui-knk/render_collection.action_view	Kasper Timm Hansen	2016-11-08	1	-0/+16
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] Add `render_collection.action_view` entry to AS instrumentation	yui-knk	2016-11-08	1	-0/+16
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #26990 from kirs/upgrade-jruby	Rafael França	2016-11-07	1	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Upgrade JRuby to satisfy gemfile	Kir Shatrov	2016-11-07	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #26982 from bogdanvlviv/started_guide	Kasper Timm Hansen	2016-11-07	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix 'Getting Started with Rails' [ci skip]	bogdanvlviv	2016-11-06	1	-2/+2
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #26986 from bogdanvlviv/docs_migrations	Eileen M. Uchitelle	2016-11-06	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Add missing spaces [ci skip]	bogdanvlviv	2016-11-07	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #26909 from matthewd/query-cache-connection	Matthew Draper	2016-11-06	4	-40/+75
\|\ \ \ \ \
\| * \| \| \| \|	Clear query cache during checkin, instead of an execution callback	Matthew Draper	2016-10-27	4	-40/+75