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

	Commit message (Expand)	Author	Age	Files	Lines
*	Ensure that assets are enabled back after the test that tests assets are disa...	Prathamesh Sonpatki	2015-12-21	1	-1/+4
*	Merge pull request #22722 from k0kubun/use-cgi-html-escape	Matthew Draper	2015-12-22	1	-4/+2
\|\
\| *	Use CGI.escapeHTML for html escape	Takashi Kokubun	2015-12-21	1	-4/+2
* \|	Merge pull request #22717 from nning/actioncable-readme-fixes	David Heinemeier Hansson	2015-12-21	1	-5/+5
\|\ \
\| * \|	One long dash in headline.	henning mueller	2015-12-21	1	-1/+1
\| * \|	Use default cable path in (in-app) server config example.	henning mueller	2015-12-21	1	-3/+3
\| * \|	Replaced "Cable" by "ActionCable" in CoffeeScript examples.	henning mueller	2015-12-21	1	-2/+2
* \| \|	Merge pull request #22692 from ryohashimoto/22669_api_generator	David Heinemeier Hansson	2015-12-21	2	-1/+33
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Action Cable channel generator should not create JS assets in --api mode	Ryo Hashimoto	2015-12-19	2	-1/+33
* \| \|	Merge pull request #22698 from y-yagi/display_detail_info_on_inline_report	Kasper Timm Hansen	2015-12-21	5	-7/+19
\|\ \ \
\| * \| \|	display detailed information in inline reporting	yuuji.yaginuma	2015-12-21	5	-7/+19
* \| \| \|	Revert "Merge pull request #22486 from methyl/fix-includes-for-groupped-assoc...	Yves Senn	2015-12-21	3	-26/+1
* \| \| \|	Merge pull request #22719 from akshay-vishnoi/fix-docs	Yves Senn	2015-12-21	1	-3/+3
\|\ \ \ \
\| * \| \| \|	[ci skip] `rails new project` generates README.md now	Akshay Vishnoi	2015-12-21	1	-3/+3
* \| \| \| \|	Merge pull request #22718 from gsamokovarov/fix-changelogs	Yves Senn	2015-12-21	8	-25/+1
\|\ \ \ \ \
\| * \| \| \| \|	No more no changes entries in the CHANGELOGs	Genadi Samokovarov	2015-12-21	8	-25/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #22581 from hirocaster/fix-expect-sample-code	Yves Senn	2015-12-21	1	-4/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Change output timming of sample code	hirocaster	2015-12-14	1	-2/+2
* \| \| \| \|	Merge pull request #22486 from methyl/fix-includes-for-groupped-association	Yves Senn	2015-12-21	3	-1/+26
\|\ \ \ \ \
\| * \| \| \| \|	Pass SQL group by values when including scoped association	Lucjan Suski	2015-12-15	3	-1/+25
* \| \| \| \| \|	Merge pull request #22706 from habermann24/fix_mattr_accessor_docs	Yves Senn	2015-12-21	1	-6/+6
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	Fix documentation for mattr_accessor methods	Jan Habermann	2015-12-20	1	-6/+6
* \| \| \| \| \|	Merge pull request #22716 from mattreduce/mattreduce-getting-started-guide	Matthew Draper	2015-12-21	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Update README extension in Getting Started guide	Matthew Conway	2015-12-20	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #22712 from jonatack/update-changelogs	Rafael França	2015-12-20	1	-0/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add missing @claudiob credit to change log [skip ci]	Jon Atack	2015-12-20	1	-0/+1
* \| \| \| \| \| \|	Merge pull request #22715 from kamipo/remove_mysql_adapter	Sean Griffin	2015-12-20	13	-98/+87
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Remove legacy mysql adapter	Ryuta Kamizono	2015-12-21	13	-98/+87
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #22711 from jonatack/add-missing-period-in-upgrading-rails...	Kasper Timm Hansen	2015-12-20	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Upgrade Guide: Add missing period, :scissors: whitespace [skip ci]	Jon Atack	2015-12-20	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #22704 from rajcybage/mysql_fix	Sean Griffin	2015-12-20	3	-4/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	mysql2 adapter instead of mysql [ci skip]	Rajarshi Das	2015-12-20	3	-4/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #22707 from yui-knk/fix_warning	Richard Schneeman	2015-12-20	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Suppress warning ambiguous first argument	yui-knk	2015-12-20	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2015-12-20	3	-5/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	remove extra spaces in fixtures doc part	Gaurav Sharma	2015-12-13	1	-2/+2
\| * \| \| \| \|	Add missing punctuation mark [ci skip]	Gaurav Sharma	2015-11-18	2	-3/+3
* \| \| \| \| \|	Add a commend about deprecation of ActiveSupport::OrderedHash	Rafael Mendonça França	2015-12-20	1	-1/+1
* \| \| \| \| \|	Merge pull request #22697 from kamipo/remove_unused_mysql_specific_schema	Yves Senn	2015-12-19	1	-62/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove unused `test/schema/mysql_specific_schema.rb`	Ryuta Kamizono	2015-12-19	1	-62/+0
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	docs, follow up to #22699. [ci skip]	Yves Senn	2015-12-19	1	-2/+2
* \| \| \| \| \|	Merge pull request #22699 from omotenko/patch-1	Kasper Timm Hansen	2015-12-19	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Update README.md	Oleg Motenko	2015-12-19	1	-1/+1
\|/ / / / /
* \| \| \| \|	Deprecation warning now targets at 5.1	Akira Matsuda	2015-12-19	2	-2/+6
* \| \| \| \|	Merge pull request #22695 from sachin21/remove_ds_store	Guillermo Iguaran	2015-12-19	1	-0/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove .DS_Store	Satoshi Ohmori	2015-12-19	1	-0/+0
\|/ / / / /
* \| \| \| \|	Merge pull request #22479 from RobinClowers/fix-cache-notification-order	Kasper Timm Hansen	2015-12-19	2	-20/+24
\|\ \ \ \ \
\| * \| \| \| \|	Fix cache fetch miss notification order	Robin Clowers	2015-12-02	2	-20/+24
* \| \| \| \| \|	Merge pull request #22683 from gwincr11/No-Doc-Rails__Generators__Actions__Cr...	Richard Schneeman	2015-12-18	2	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add No Doc	Cory Gwin	2015-12-18	2	-1/+1