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

	Commit message (Expand)	Author	Age	Files	Lines
*	Expand on Action Mailer Fragment caching tests	Vipul A M	2016-04-17	6	-4/+63
*	Merge pull request #22911 from Envek/database_comments	Jeremy Daer	2016-04-16	15	-37/+280
\|\
\| *	Add support for specifying comments for tables, columns, and indexes.	Andrey Novikov	2016-04-16	15	-37/+286
* \|	Merge pull request #24574 from y-yagi/donot_remove_cable.js	Jeremy Daer	2016-04-16	2	-1/+15
\|\ \
\| * \|	don't remove `cable.js`	yuuji.yaginuma	2016-04-16	2	-1/+15
\| \|/
* \|	documentation for add_references index option [ci skip]	Vipul A M	2016-04-17	2	-2/+12
\|\ \ \| \|/ \|/\|
\| *	[ci skip] docs for add_references index option	Alex Handley	2016-04-16	2	-2/+12
* \|	Merge pull request #24565 from javiervidal/rails_update_task	Kasper Timm Hansen	2016-04-15	1	-1/+1
\|\ \
\| * \|	Add a note about how to execute 'rails app:update' on 4.2 and earlier [ci skip]	Javier Vidal	2016-04-15	1	-1/+1
* \| \|	Merge pull request #24556 from vipulnsward/24542-changelog	Jeremy Daer	2016-04-15	1	-0/+6
\|\ \ \
\| * \| \|	Add changelog for #24542	Vipul A M	2016-04-15	1	-0/+6
* \| \| \|	Merge pull request #24559 from vipulnsward/fix-ac-tests	Jeremy Daer	2016-04-15	2	-5/+3
\|\ \ \ \
\| * \| \| \|	- Fixed ActionCable::Connection::ClientSocketTest that was overriding ActionC...	Vipul A M	2016-04-15	2	-5/+3
\| \|/ / /
* \| \| \|	Merge pull request #24517 from estolfo/transform-keys-return-type-master	Sean Griffin	2016-04-15	2	-1/+17
\|\ \ \ \
\| * \| \| \|	Restore Hash#transform_keys behavior to always return a Hash instance	Emily	2016-04-12	2	-1/+17
* \| \| \| \|	Filter scalar values when params permit hashes or arrays	Sean Griffin	2016-04-15	2	-1/+14
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge pull request #24560 from javiervidal/20160415	प्रथमेश Sonpatki	2016-04-15	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix broken link in 'Ruby on Rails 4.0 Release Notes' [ci skip]	Javier Vidal	2016-04-15	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #24557 from y-yagi/update_example_to_specify_ac_mount_path	Vipul A M	2016-04-15	2	-8/+9
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	update example to specify the Action Cable mount path [ci skip]	yuuji.yaginuma	2016-04-15	2	-8/+9
* \| \| \|	Merge pull request #24549 from kamipo/fix_quoted_time	Jeremy Daer	2016-04-14	2	-3/+12
\|\ \ \ \
\| * \| \| \|	Should keep quoting behaivor of a time column value in sqlite3 adapter	Ryuta Kamizono	2016-04-15	2	-3/+12
\|/ / / /
* \| \| \|	Merge pull request #24540 from sgrif/sg-actioncable-callbacks	Sean Griffin	2016-04-14	2	-5/+30
\|\ \ \ \
\| * \| \| \|	Run Action Cable callbacks through the worker pool	Sean Griffin	2016-04-13	2	-5/+30
* \| \| \| \|	Merge pull request #24454 from iangilfillan/master	Vipul A M	2016-04-14	4	-13/+15
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	MariaDB Documentation	iangilfillan	2016-04-14	4	-13/+15
* \| \| \| \|	Merge pull request #24542 from kamipo/add_quoted_time	Jeremy Daer	2016-04-13	3	-1/+18
\|\ \ \ \ \
\| * \| \| \| \|	Add `quoted_time` for truncating the date part of a time column value	Ryuta Kamizono	2016-04-14	3	-1/+18
\|/ / / / /
* \| \| \| \|	Merge pull request #24522 from vipulnsward/run-mariadb-on-travis	Jeremy Daer	2016-04-13	3	-4/+10
\|\ \ \ \ \
\| * \| \| \| \|	Include running mariadb on travis	Vipul A M	2016-04-14	3	-4/+10
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #24543 from prathamesh-sonpatki/fix-ap-changelog	Richard Schneeman	2016-04-13	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Remove extra `so` from the Action Pack CHANGELOG	Prathamesh Sonpatki	2016-04-14	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #24533 from vipulnsward/nodoc-version	Sean Griffin	2016-04-13	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	:nodoc: version method.	Vipul A M	2016-04-13	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #24525 from tomkadwill/action-mailer-base-docs2	Vipul A M	2016-04-14	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	Update ActionMailer base documentation [ci skip]	Tom Kadwill	2016-04-13	1	-3/+3
* \| \| \| \| \|	Merge pull request #24539 from bogdan/diry-keyword-args	Sean Griffin	2016-04-13	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fixed bug introduced in #24519. Makes build green again	Bogdan Gusiev	2016-04-13	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #24536 from vipulnsward/ruby-2-upgrading	Rafael França	2016-04-13	1	-1/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Add ruby 2.2.2+ version requirement for Rails 5 apps	Vipul A M	2016-04-13	1	-1/+2
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #24519 from bogdan/diry-keyword-args	Jeremy Daer	2016-04-13	1	-8/+8
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	Use keyword arguments to cleanup without droping performance	Bogdan Gusiev	2016-04-13	1	-8/+8
* \| \| \| \| \|	Properly serialize all JSON primitives in the AR JSON type	Sean Griffin	2016-04-13	4	-14/+30
* \| \| \| \| \|	Remove unused variable	Rafael Mendonça França	2016-04-13	1	-1/+0
* \| \| \| \| \|	Remove time calculatiosn extension	Rafael Mendonça França	2016-04-13	1	-0/+2
* \| \| \| \| \|	Merge pull request #24318 from bogdanvlviv/patch-1	Rafael Mendonça França	2016-04-12	2	-1/+5
\|\ \ \ \ \ \
\| * \| \| \| \| \|	extension synonyms yml and yaml	Bogdan	2016-03-27	2	-1/+5
* \| \| \| \| \| \|	Merge pull request #24524 from prathamesh-sonpatki/cablejs-for-channels	Rafael França	2016-04-12	3	-0/+22
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Generate `cable.js` file if does not exist when generating channel	Prathamesh Sonpatki	2016-04-12	3	-0/+22
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #24515 from Sen-Zhang/attribute_changed_not_return_nil	Sean Griffin	2016-04-12	2	-3/+3
\|\ \ \ \ \ \