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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23420 from y-yagi/move_api_test_to_appropriate_file	Rafael França	2016-02-02	2	-11/+10
\|\
\| *	move `test_generator_if_skip_action_cable_is_given_for_an_api_app` to the app...	yuuji.yaginuma	2016-02-02	2	-11/+10
* \|	Merge pull request #23396 from pschambacher/pschambacher/fix_assert_generates	Rafael França	2016-02-02	1	-0/+1
\|\ \
\| * \|	Duplicate assert_generates options before modifying it	Pierre Schambacher	2016-02-01	1	-0/+1
* \| \|	Merge pull request #23414 from maclover7/23411	Rafael França	2016-02-02	3	-3/+16
\|\ \ \
\| * \| \|	Fix regression in `Hash#dig` for HashWithIndifferentAccess.	Jon Moss	2016-02-01	3	-3/+16
\|/ / /
* \| /	Generated engines should protect from forgery	Aaron Patterson	2016-02-01	2	-3/+4
\| \|/ \|/\|
* \|	:warning: assigned but unused variable - err	Akira Matsuda	2016-02-02	1	-2/+2
* \|	Merge pull request #23408 from kangkyu/patch-1	Claudio B	2016-02-01	1	-2/+2
\|\ \
\| * \|	Update CHANGELOG.md	Kang-Kyu Lee	2016-02-01	1	-2/+2
\|/ /
* \|	Add some Action Cable CHANGELOG entries	Rafael Mendonça França	2016-02-01	6	-16/+11
* \|	Preparing for Rails 5.0.0.beta2	Sean Griffin	2016-02-01	22	-46/+96
* \|	Merge pull request #23407 from jeremy/corrupt-before-commit	Jeremy Daer	2016-02-01	2	-2/+33
\|\ \
\| * \|	Fix corrupt transaction state caused by `before_commit` exceptions	Jeremy Daer	2016-02-01	2	-2/+33
* \| \|	Add spaces in the braces.	Kasper Timm Hansen	2016-02-01	1	-1/+1
* \| \|	Converge on filter.	Kasper Timm Hansen	2016-02-01	1	-5/+4
* \| \|	Simplify filter normalization.	Kasper Timm Hansen	2016-02-01	1	-5/+3
* \| \|	Merge pull request #23225 from vipulnsward/20420-rake-routes-options	Kasper Timm Hansen	2016-02-01	7	-30/+163
\|\ \ \
\| * \| \|	Add options for rake routes task	Vipul A M	2016-02-02	7	-30/+163
* \| \| \|	Revert "Merge pull request #16400 from bogdan/last-with-sql"	Sean Griffin	2016-02-01	3	-60/+31
* \| \| \|	Merge pull request #23398 from matthewd/interlock	Matthew Draper	2016-02-02	4	-23/+119
\|\ \ \ \
\| * \| \| \|	After completing a load, give other threads a chance too	Matthew Draper	2016-02-02	3	-15/+46
\| * \| \| \|	While new sharers are blocked, an existing sharer remains re-entrant	Matthew Draper	2016-02-02	2	-1/+30
\| * \| \| \|	Block new share attempts if there's an exclusive waiter	Matthew Draper	2016-02-02	2	-8/+44
\| * \| \| \|	Always obtain the lock and do the unload	Matthew Draper	2016-02-02	1	-1/+1
* \| \| \| \|	Merge pull request #23406 from hackerkid/master	Vipul A M	2016-02-02	1	-5/+5
\|\ \ \ \ \
\| * \| \| \| \|	.git added to https repo urls	Vishnu Ks	2016-02-02	1	-5/+5
* \| \| \| \| \|	Merge pull request #23151 from maclover7/fix-23148	Rafael França	2016-02-01	2	-0/+11
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add documentation for #17573	Jon Moss	2016-02-01	2	-0/+11
* \| \| \| \| \| \|	Merge pull request #23402 from hackerkid/master	Richard Schneeman	2016-02-01	1	-5/+5
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| / / \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	git protocol replaced with https	Vishnu Ks	2016-02-02	1	-5/+5
* \| \| \| \| \|	Merge pull request #23025 from yahonda/shorten_internal_metadata_table_name_l...	Sean Griffin	2016-02-01	6	-14/+42
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Rename `active_record_internal_metadatas` to `ar_internal_metadata`	Yasuo Honda	2016-02-01	2	-0/+28
\| * \| \| \| \|	Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadata	Yasuo Honda	2016-02-01	5	-14/+14
\| \|/ / / /
* \| \| \| \|	Merge pull request #23401 from claudiob/fix-as-changelog-md	Claudio B	2016-02-01	1	-29/+29
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	[ci skip] Properly indent code in markdown	claudiob	2016-02-01	1	-29/+29
\|/ / / /
* \| \| \|	Merge pull request #23057 from schneems/schneems/default-puma-config	Richard Schneeman	2016-02-01	5	-3/+64
\|\ \ \ \
\| * \| \| \|	Add Default Puma Config	schneems	2016-01-29	5	-3/+64
* \| \| \| \|	Merge pull request #23385 from matthewd/default-subscription-adapter	Matthew Draper	2016-02-02	1	-4/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Use the in-process subscription adapter for development & test	Matthew Draper	2016-02-01	1	-4/+2
* \| \| \| \|	Merge pull request #23381 from matthewd/uneventful-redis	Matthew Draper	2016-02-02	8	-35/+212
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Switch the default redis adapter to a single-stream model	Matthew Draper	2016-02-01	8	-35/+212
* \| \| \| \|	Merge pull request #23375 from prathamesh-sonpatki/fix-19835	Rafael França	2016-02-01	2	-13/+6
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Fix documentation related to `config.assets.cache_store` [ci skip]	Prathamesh Sonpatki	2016-02-01	2	-13/+6
* \| \| \| \|	tabenai (typo)	Akira Matsuda	2016-02-01	1	-6/+6
* \| \| \| \|	Merge pull request #23391 from erullmann/join_table_indexes	Rafael França	2016-02-01	1	-0/+4
\|\ \ \ \ \
\| * \| \| \| \|	Added references option to join tables	Ernst Rullmann	2016-01-31	1	-0/+4
* \| \| \| \| \|	Merge pull request #23168 from kamipo/avoid_extra_show_variables_in_migration	Rafael França	2016-02-01	5	-21/+15
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Avoid extra `show variables` in migration	Ryuta Kamizono	2016-02-01	5	-21/+15
\|/ / / / /
* \| \| \| \|	Merge pull request #23359 from kamipo/make_to_primary_key	Rafael França	2016-02-01	4	-40/+5
\|\ \ \ \ \