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

	Commit message (Expand)	Author	Age	Files	Lines
*	Import the relevant portions of faye-websocket	Matthew Draper	2016-01-24	14	-44/+332
*	Using a hacked faye-websocket, drop EventMachine	Matthew Draper	2016-01-24	17	-69/+70
*	Merge pull request #23217 from matthewd/adapter-tests	Matthew Draper	2016-01-24	17	-37/+389
\|\
\| *	Add tests for the ActionCable adapters	Matthew Draper	2016-01-24	9	-0/+236
\| *	Allow subscription adapters to be shut down	Matthew Draper	2016-01-24	4	-14/+40
\| *	Add Async and Inline adapters	Matthew Draper	2016-01-24	2	-0/+44
\| *	Normalize on no arguments for the success callback	Matthew Draper	2016-01-24	2	-2/+2
\| *	Split internal subscriber tracking from Postgres adapter	Matthew Draper	2016-01-24	3	-24/+70
* \|	Merge pull request #23216 from prathamesh-sonpatki/fix-23137	Matthew Draper	2016-01-24	2	-1/+9
\|\ \ \| \|/ \|/\|
\| *	Rails::Generators::Actions#gem should work even if frozen string is passed as...	Prathamesh Sonpatki	2016-01-24	2	-1/+9
\|/
*	Add environment back to db:structure:load	Andrew White	2016-01-23	1	-1/+1
*	Merge pull request #23102 from yui-knk/foreign_type_to_singular_association	Eileen M. Uchitelle	2016-01-23	3	-3/+3
\|\
\| *	Define `:foreign_type` as a valid option in `SingularAssociation`	yui-knk	2016-01-19	3	-3/+3
* \|	Use the database type to deserialize enum	Sean Griffin	2016-01-23	4	-4/+19
* \|	Document scoping issue with Time.use_zone	Andrew White	2016-01-23	1	-1/+17
* \|	Merge pull request #23206 from joyvuu-dave/action_cable_api_fix	Kasper Timm Hansen	2016-01-23	2	-1/+13
\|\ \
\| * \|	prevent --skip-action-cable from erroring when --api option is used	Dave Riddle	2016-01-22	2	-1/+13
\|/ /
* \|	Merge pull request #23207 from y-yagi/fix_path_of_actioncable_config	प्रथमेश Sonpatki	2016-01-23	1	-2/+2
\|\ \
\| * \|	fix path of Action Cable configuration file [ci skip]	yuuji.yaginuma	2016-01-23	1	-2/+2
\|/ /
* \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2016-01-22	1	-1/+1
\|\ \
\| * \|	[ci skip] An internal link is an relative path	yui-knk	2015-12-23	1	-1/+1
* \| \|	Merge pull request #23201 from dkniffin/patch-1	Jon Moss	2016-01-22	1	-7/+7
\|\ \ \
\| * \| \|	Move ApplicationCable::Channel section of readme	Derek Kniffin	2016-01-22	1	-7/+7
\|/ / /
* \| \|	Merge pull request #23126 from Gaurav2728/implement_rake_to_rails_taks_in_doc	Jon Moss	2016-01-22	1	-43/+62
\|\ \ \
\| * \| \|	Rails 5.0+ rake commands implemented in Rails Framework itself. We prefer to ...	Gaurav Sharma	2016-01-22	1	-43/+62
* \| \| \|	Merge pull request #23194 from britg/patch-2	Matthew Draper	2016-01-23	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Use the correct reference to the redis connection	Brit Gardner	2016-01-22	1	-1/+1
\|/ / /
* \| \|	Merge pull request #23177 from vipulnsward/testing-pass-1	Jon Moss	2016-01-22	1	-7/+7
\|\ \ \
\| * \| \|	First pass over parts of Testing guide	Vipul A M	2016-01-22	1	-7/+7
* \| \| \|	Merge pull request #23182 from palkan/add-docs-tsrange	Jon Moss	2016-01-22	1	-1/+5
\|\ \ \ \
\| * \| \| \|	[ci skip] Add note about tsrange and timezone awareness to docs	palkan	2016-01-22	1	-1/+5
\|/ / / /
* \| \| \|	Merge pull request #23178 from vipulnsward/rm-changelog	Andrew White	2016-01-22	1	-4/+0
\|\ \ \ \
\| * \| \| \|	rm changelog for unreleased changes fixes	Vipul A M	2016-01-22	1	-4/+0
* \| \| \| \|	Merge pull request #23180 from y-yagi/remove_per_form_csrf_tokens_initializer...	Andrew White	2016-01-22	2	-0/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	remove `per_form_csrf_tokens` initializer from Rails API	yuuji.yaginuma	2016-01-22	2	-0/+2
\|/ / / /
* \| \| \|	Merge pull request #23174 from JuanitoFatas/followup-skip-action-cable	Kasper Timm Hansen	2016-01-22	2	-0/+4
\|\ \ \ \
\| * \| \| \|	Remove action_cable_meta_tag when skip action_cable	JuanitoFatas	2016-01-22	2	-0/+4
* \| \| \| \|	Merge pull request #23175 from maclover7/add-ac-appgen-test	Kasper Timm Hansen	2016-01-22	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Add `config/cable.yml` to list of default files in Rails generator	Jon Moss	2016-01-21	1	-0/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #23080 from prathamesh-sonpatki/fix-cache-key-for-loaded-e...	Matthew Draper	2016-01-22	2	-1/+11
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix ActiveRecord::Relation#cache_key for loaded empty collection	Prathamesh Sonpatki	2016-01-16	2	-1/+11
* \| \| \| \|	Merge pull request #23167 from maclover7/fix-21032	Rafael França	2016-01-21	3	-1/+15
\|\ \ \ \ \
\| * \| \| \| \|	Fix `ActionController::Parameters#==` bug	Jon Moss	2016-01-21	3	-1/+15
* \| \| \| \| \|	Merge pull request #23078 from y-yagi/add_application_mailer_rb_to_mountable_...	Rafael França	2016-01-21	4	-1/+12
\|\ \ \ \ \ \
\| * \| \| \| \| \|	allow symbol to end of string in `wrap_in_modules`	yuuji.yaginuma	2016-01-16	2	-5/+5
\| * \| \| \| \| \|	add application_mailer.rb to template of mountable engine	yuuji.yaginuma	2016-01-15	3	-0/+11
* \| \| \| \| \| \|	Merge pull request #23165 from shakib609/fix-23157	Jon Moss	2016-01-21	1	-0/+5
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] fix #23157	Shakib Hossain	2016-01-22	1	-0/+5
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Use bind parameters for ranges in where clauses	Sean Griffin	2016-01-21	2	-2/+36
* \| \| \| \| \| \|	Merge pull request #23164 from vipulnsward/warning-from-renderers-test	Kasper Timm Hansen	2016-01-21	1	-1/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|