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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #20997 from himesh-r/issue-20995	Arthur Neves	2016-02-02	2	-2/+5
\|\
\| *	Changed id-writer to save join table records based on association primary key...	Himesh	2016-02-02	2	-2/+5
* \|	Sleep well, sweet prince	Sean Griffin	2016-02-02	1	-1/+1
* \|	Merge pull request #23437 from ryohashimoto/160203_guide_rails_secret	Jon Moss	2016-02-02	2	-2/+2
\|\ \
\| * \|	use rails secret in rails guides	Ryo Hashimoto	2016-02-03	2	-2/+2
\|/ /
* \|	Merge pull request #23434 from remomueller/bump-minimum-pg-version	Rafael França	2016-02-02	2	-3/+8
\|\ \
\| * \|	The minimum supported version of PostgreSQL is now >= 9.1	Remo Mueller	2016-02-02	2	-3/+8
\|/ /
* \|	Merge pull request #23433 from BillyZac/master	Arthur Nogueira Neves	2016-02-02	1	-2/+2
\|\ \
\| * \|	Fix typo.	Zachary Smith	2016-02-02	1	-2/+2
* \| \|	Merge pull request #23429 from qrush/actioncable-doc-update	Eileen M. Uchitelle	2016-02-02	4	-40/+53
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	[ci skip] Several ActionCable documentation updates:	Nick Quaranto	2016-02-02	4	-40/+53
\|/ /
* \|	Ensure tz aware attributes continue to work with arrays	Sean Griffin	2016-02-02	1	-1/+1
* \|	Avoid infinite recursion when bad values are passed to tz aware fields	Sean Griffin	2016-02-02	2	-2/+19
* \|	Merge pull request #23423 from yui-knk/remove_unnecessary_override	Sean Griffin	2016-02-02	1	-12/+0
\|\ \
\| * \|	Remove unnecessary overriding of `#initialize`	yui-knk	2016-02-02	1	-12/+0
* \| \|	Merge pull request #23426 from RyanNielson/patch-1	Kasper Timm Hansen	2016-02-02	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Change command_task.rb to commands_task.rb in docs	Ryan Nielson	2016-02-02	1	-1/+1
\|/ /
* \|	Merge pull request #23331 from amatsuda/valid_scope_name	Rafael França	2016-02-02	2	-0/+29
\|\ \
\| * \|	Suppress :warning:s	Akira Matsuda	2016-01-28	1	-1/+1
\| * \|	scope needs the second argument	Akira Matsuda	2016-01-28	1	-1/+1
\| * \|	Revert "Remove valid_scope_name? check - use ruby"	Akira Matsuda	2016-01-28	2	-0/+29
* \| \|	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