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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23458 from kamipo/activerecord_supports_mysql_5.0_and_up	Sean Griffin	2016-02-03	4	-14/+10
\|\
\| *	Active Record supports MySQL >= 5.0	Ryuta Kamizono	2016-02-04	4	-14/+10
* \|	Merge pull request #23452 from phusion/action_cable	Jon Moss	2016-02-03	1	-2/+11
\|\ \
\| * \|	Document the fact that Action Cable does not require a multi-threaded app server	Hongli Lai (Phusion)	2016-02-03	1	-2/+11
* \| \|	Merge pull request #23465 from kamipo/sqlite2_support_has_been_dropped	Sean Griffin	2016-02-03	3	-4/+1
\|\ \ \
\| * \| \|	SQLite 2 support has been dropped [ci skip]	Ryuta Kamizono	2016-02-04	3	-4/+1
\|/ / /
* \| \|	Merge pull request #23459 from mperham/master	Arthur Nogueira Neves	2016-02-03	2	-2/+0
\|\ \ \
\| * \| \|	Remove unused dependency	Mike Perham	2016-02-03	2	-2/+0
* \| \| \|	Merge pull request #23457 from matthewd/arel-attribute	Matthew Draper	2016-02-04	12	-31/+38
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Extract a Relation#arel_attribute	Matthew Draper	2016-02-04	7	-16/+20
\| * \| \|	Defer Arel attribute lookup to the model class	Matthew Draper	2016-02-04	12	-31/+34
* \| \| \|	Merge pull request #23456 from kaspth/line-filter-triggers-one-runnable	Kasper Timm Hansen	2016-02-03	2	-2/+26
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix model test path typo uncovered in previous commit.	Kasper Timm Hansen	2016-02-03	1	-1/+1
\| * \| \|	Fix line filters running tests from multiple runnables.	Kasper Timm Hansen	2016-02-03	2	-1/+25
* \| \| \|	Merge pull request #23455 from alexeyzab/add_apple_dummy_icon_files	Rafael França	2016-02-03	3	-0/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Add dummy apple icon files	Alexey Zabelin	2016-02-03	3	-0/+4
\|/ / /
* \| \|	Merge pull request #23442 from prathamesh-sonpatki/improve-pg-version-old-err...	Rafael França	2016-02-03	2	-1/+4
\|\ \ \
\| * \| \|	Mention PostgreSQL version support in release notes [ci skip]	Prathamesh Sonpatki	2016-02-03	1	-0/+3
\| * \| \|	Mention supported PG version in the error message.	Prathamesh Sonpatki	2016-02-03	1	-1/+1
* \| \| \|	Merge pull request #23453 from mperham/remove_json	Rafael França	2016-02-03	3	-4/+0
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Remove json gem dependency	Mike Perham	2016-02-03	3	-4/+0
\|/ / /
* \| \|	Merge pull request #23443 from prathamesh-sonpatki/fix-logging-in-development	Matthew Draper	2016-02-04	1	-0/+2
\|\ \ \
\| * \| \|	Put some space for non-assets requests in development mode	Prathamesh Sonpatki	2016-02-03	1	-0/+2
\| \|/ /
* \| \|	Merge pull request #23447 from y-yagi/update_pg_supported_version_in_docs	Yves Senn	2016-02-03	4	-4/+4
\|\ \ \
\| * \| \|	update supported version of PostgreSQL in docs [ci skip]	yuuji.yaginuma	2016-02-03	4	-4/+4
* \| \| \|	Typos in AR tests	Akira Matsuda	2016-02-03	6	-10/+10
* \| \| \|	Merge pull request #23436 from y-yagi/use_bin_command_in_routes_task	Kasper Timm Hansen	2016-02-03	3	-17/+17
\|\ \ \ \
\| * \| \| \|	use rails command in routes task	yuuji.yaginuma	2016-02-03	3	-17/+17
\| \|/ / /
* \| \| \|	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
\|\ \ \