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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23534 from bronson/fix-redefined-warning	Arthur Nogueira Neves	2016-02-08	1	-0/+1
\|\
\| *	fix 'method redefined' warnings	Scott Bronson	2016-02-06	1	-0/+1
* \|	Merge pull request #23563 from pra85/patch-2	Jon Moss	2016-02-08	1	-1/+1
\|\ \
\| * \|	Fix a typo	Prayag Verma	2016-02-08	1	-1/+1
\|/ /
* \|	Revert "Merge pull request #23562 from Azzurrio/patch-1"	Rafael Mendonça França	2016-02-08	1	-1/+1
* \|	Merge pull request #23562 from Azzurrio/patch-1	Kasper Timm Hansen	2016-02-08	1	-1/+1
\|\ \
\| * \|	Update rails-html-sanitizer version to v1.0.3	Karim El-Husseiny	2016-02-08	1	-1/+1
\|/ /
* \|	Merge pull request #23560 from prathamesh-sonpatki/rm-rails-4-from-assets-guide	प्रथमेश Sonpatki	2016-02-08	1	-9/+9
\|\ \
\| * \|	Remove references to Rails 4 from assets guide [ci skip]	Prathamesh Sonpatki	2016-02-08	1	-9/+9
* \| \|	Merge pull request #23552 from bronson/revert-dev-cache	Kasper Timm Hansen	2016-02-08	6	-54/+49
\|\ \ \
\| * \| \|	revert dev:cache to rake task, fixes #23410	Scott Bronson	2016-02-07	6	-54/+49
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #23558 from kamipo/add_numeric_type_in_doc	Vipul A M	2016-02-08	1	-3/+3
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add numeric type in the doc [ci skip]	Ryuta Kamizono	2016-02-08	1	-3/+3
* \| \|	Merge pull request #23556 from y-yagi/remove_faye-websocket_from_readme	प्रथमेश Sonpatki	2016-02-08	1	-1/+1
\|\ \ \
\| * \| \|	remove `faye-websocket` dependency from README [ci skip]	yuuji.yaginuma	2016-02-08	1	-1/+1
* \| \| \|	Merge pull request #23554 from romaimperator/update_action_cable_config_example	Jon Moss	2016-02-07	1	-3/+3
\|\ \ \ \
\| * \| \| \|	config examples for ActionCable now use Rails.application.config.action_cable	Daniel Fox	2016-02-07	1	-3/+3
* \| \| \| \|	Merge pull request #23559 from mabras/patch-1	Richard Schneeman	2016-02-07	1	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	update turbolinks url [ci skip]	mabras	2016-02-08	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #23547 from kamipo/schema_type_returns_symbol	Sean Griffin	2016-02-07	3	-8/+8
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	`schema_type` returns symbol rather than string	Ryuta Kamizono	2016-02-08	3	-8/+8
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #23508 from meinac/add_numeric_type_into_migrations	Sean Griffin	2016-02-07	2	-0/+12
\|\ \ \
\| * \| \|	Added numeric helper into migrations.	Mehmet Emin İNAÇ	2016-02-07	2	-0/+12
* \| \| \|	Merge pull request #23531 from coldnebo/docfix	Jon Moss	2016-02-07	2	-3/+6
\|\ \ \ \
\| * \| \| \|	doc changes	Larry Kyrala	2016-02-07	2	-3/+6
\|/ / / /
* \| \| \|	Merge pull request #23532 from matthewd/live-interlock	Matthew Draper	2016-02-08	4	-48/+252
\|\ \ \ \
\| * \| \| \|	Manual yield doesn't block new shares	Matthew Draper	2016-02-08	1	-5/+6
\| * \| \| \|	Test the happy path for recursive yields too	Matthew Draper	2016-02-08	1	-0/+35
\| * \| \| \|	Fix a nonsensical ShareLock test.	thedarkone	2016-02-07	1	-22/+21
\| * \| \| \|	Eagerly reacquire when start_sharing is nested inside yield_shares	Matthew Draper	2016-02-08	1	-11/+18
\| * \| \| \|	AS::Conc::ShareLock#yield_shares tests.	thedarkone	2016-02-07	1	-0/+107
\| * \| \| \|	Hand off the interlock to the new thread in AC::Live	Matthew Draper	2016-02-07	4	-38/+93
\| \| \|/ / \| \|/\| \|
* \| \| \|	Add SVG as a default mime type	David Heinemeier Hansson	2016-02-07	2	-0/+5
* \| \| \|	Merge pull request #23540 from vipulnsward/publish-api-apps-doc	Vijay Dev	2016-02-07	1	-1/+0
\|\ \ \ \
\| * \| \| \|	Publish guide on "Using Rails for API-only Applications"	Vipul A M	2016-02-07	1	-1/+0
\|/ / / /
* \| \| \|	Separate for new and existing applications clearly	Vijay Dev	2016-02-07	1	-0/+4
* \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2016-02-07	4	-15/+16
\|\ \ \ \
\| * \| \| \|	fix indentation	Vijay Dev	2016-02-07	1	-1/+1
\| * \| \| \|	[ci skip] Good bye SQLite2	yui-knk	2016-02-06	1	-2/+0
\| * \| \| \|	[ci skip] fix typo	Mikhail Dieterle	2016-01-30	1	-1/+1
\| * \| \| \|	[ci skip] Fix one more typo	Prathamesh Sonpatki	2016-01-30	1	-1/+1
\| * \| \| \|	[ci skip] Update internal documents about ActiveRecord's Reflection	yui-knk	2016-01-30	1	-11/+14
\| * \| \| \|	[ci skip] Fix typo	yui-knk	2016-01-27	1	-1/+1
* \| \| \| \|	Merge pull request #23533 from y-yagi/fix_typo_in_assert_enqueued_jobs_example	Jon Moss	2016-02-06	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	fix typo in `assert_enqueued_jobs` example [ci skip]	yuuji.yaginuma	2016-02-07	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #23519 from kamipo/mariadb_does_not_support_json_type	Sean Griffin	2016-02-06	1	-1/+1
\|\ \ \ \
\| * \| \| \|	MariaDB does not support JSON type	Ryuta Kamizono	2016-02-06	1	-1/+1
* \| \| \| \|	Avoid coupling Action Pack to Railties.	Kasper Timm Hansen	2016-02-06	1	-1/+1
* \| \| \| \|	Merge pull request #23529 from syamilmj/remove_unused_method	Rafael França	2016-02-06	1	-4/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove unused private method	Syamil MJ	2016-02-07	1	-4/+0
\|/ / / / /