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

	Commit message (Expand)	Author	Age	Files	Lines
*	release notes, extract notable changes from Action Mailer CHANGELOG.	Yves Senn	2015-12-22	2	-3/+21
*	release notes, extract notable changes from Action View CHANGELOG.	Yves Senn	2015-12-22	2	-7/+28
*	release notes, use past tense. [ci skip]	Yves Senn	2015-12-22	1	-15/+15
*	release notes, extract notable changes from Action Pack CHANGELOG.	Yves Senn	2015-12-22	2	-24/+139
*	[ci skip] Steal `ActionCable.server` mounting from routes template.	Kasper Timm Hansen	2015-12-22	1	-2/+2
*	release notes, extract notable changes from Railties CHANGELOG.	Yves Senn	2015-12-22	2	-9/+53
*	guides, restructure Rails 5.0 release notes. [ci skip]	Yves Senn	2015-12-22	2	-91/+160
*	Merge pull request #22701 from maclover7/rails-5-release-notes	Yves Senn	2015-12-22	1	-0/+188
\|\
\| *	Add Rails 5.0 Release Notes	Jon Moss	2015-12-21	1	-0/+188
* \|	Merge pull request #22483 from y-yagi/use_bin_test_in_plugins_guide	Yves Senn	2015-12-22	1	-32/+67
\|\ \
\| * \|	use `bin/test` in plugins guide [ci skip]	yuuji.yaginuma	2015-12-22	1	-32/+67
\| \|/
* \|	Merge pull request #22752 from y-yagi/remove_div_for_from_doc	Matthew Draper	2015-12-22	1	-8/+9
\|\ \
\| * \|	do not use `div_for` in example [ci skip]	yuuji.yaginuma	2015-12-22	1	-8/+9
\| \|/
* \|	Merge pull request #22754 from ryohashimoto/151222_remove_content_tag_for	Matthew Draper	2015-12-22	1	-7/+5
\|\ \
\| * \|	remove content_tag_for example	Ryo Hashimoto	2015-12-22	1	-7/+5
* \| \|	Merge pull request #22753 from gwincr11/keeps-options-breaks-assets	Matthew Draper	2015-12-22	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix .keep file issue with ActionCable	Cory Gwin	2015-12-21	1	-1/+1
* \| \|	Merge pull request #22746 from davidenglishmusic/master	Guillermo Iguaran	2015-12-21	1	-1/+1
\|\ \ \
\| * \| \|	corrects a typo	David English	2015-12-21	1	-1/+1
\|/ / /
* \| \|	Merge pull request #22709 from jonatack/clarify-explanation-for-new-config-ha...	Rafael França	2015-12-21	1	-1/+1
\|\ \ \
\| * \| \|	Clarify config settings for AS::halt_callback_chains_on_return_false	Jon Atack	2015-12-21	1	-1/+1
* \| \| \|	Merge pull request #22745 from claudiob/fix-hartl-link	Claudio B	2015-12-21	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix Rails tutorial link	claudiob	2015-12-21	1	-1/+1
\|/ / /
* \| \|	Merge pull request #22739 from akshay-vishnoi/fix-docs	Rafael França	2015-12-21	1	-1/+1
\|\ \ \
\| * \| \|	[ci skip] Fix typo	Akshay Vishnoi	2015-12-22	1	-1/+1
\|/ / /
* \| \|	Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cable	Rafael França	2015-12-21	2	-0/+11
\|\ \ \
\| * \| \|	Ensure Action Cable files are removed when `skip_action_cable` is set.	Jey Balachandran	2015-12-21	2	-0/+11
* \| \| \|	Use the generators options to not generate channel assets	Rafael Mendonça França	2015-12-21	2	-7/+6
* \| \| \|	Merge pull request #22727 from prathamesh-sonpatki/fix-master	Kasper Timm Hansen	2015-12-21	1	-1/+4
\|\ \ \ \
\| * \| \| \|	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 #22736 from akshay-vishnoi/fix-changelogs	Rafael França	2015-12-21	2	-6/+0
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] No more no changes entries in the CHANGELOGs (cases left in #22718)	Akshay Vishnoi	2015-12-22	2	-6/+0
\|/ / / / /
* \| \| \| \|	Merge pull request #22735 from reshleman/patch-1	Claudio B	2015-12-21	1	-2/+10
\|\ \ \ \ \
\| * \| \| \| \|	Update "Support" in ActionCable README [ci skip]	Robert Eshleman	2015-12-21	1	-2/+10
\|/ / / / /
* \| \| \| \|	Remember the parameter hash we return	Matthew Draper	2015-12-22	1	-1/+1
* \| \| \| \|	Merge pull request #22693 from yui-knk/use_appropriate_rebuild_task	Yves Senn	2015-12-21	1	-1/+8
\|\ \ \ \ \
\| * \| \| \| \|	Use an appropriate rebuild task on Travis	yui-knk	2015-12-22	1	-1/+8
* \| \| \| \| \|	Merge pull request #22684 from teknofire/fix-using-add_resource-with-a-block-...	Yves Senn	2015-12-21	3	-1/+14
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fixes using `add_source` with a block after using `gem` in a custom rails	Will Fisher	2015-12-21	3	-1/+14
* \| \| \| \| \|	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