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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'actioncable-notifications'	Rafael Mendonça França	2016-03-30	3	-5/+97
\|\
\| *	Keep logging in the ActionCable::Channel::Base	Rafael Mendonça França	2016-03-30	3	-110/+6
\| *	Merge pull request #23723 from mwear/action_cable_notifications	Rafael Mendonça França	2016-03-29	5	-8/+204
\| \|\
\| \| *	Add AS::Notifications and LogSubscriber to ActionCable::Channel	Matthew Wear	2016-03-04	5	-8/+204
* \| \|	Merge pull request #24362 from kamipo/add_test_create_record_with_pk_as_zero	Rafael França	2016-03-29	2	-0/+7
\|\ \ \
\| * \| \|	Add a test case for create a record with primary key as zero	Ryuta Kamizono	2016-03-30	2	-0/+7
* \| \| \|	Merge pull request #24363 from kamipo/remove_except_helper_in_test_schema	Rafael França	2016-03-29	1	-7/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Remove `except` helper for test schema	Ryuta Kamizono	2016-03-30	1	-7/+1
\| \|/ /
* \| \|	Merge pull request #24349 from chrisarcand/add-changelog-for-24305	Rafael França	2016-03-29	1	-0/+6
\|\ \ \
\| * \| \|	Add changelog for #24305 [skip ci]	Chris Arcand	2016-03-28	1	-0/+6
* \| \| \|	Merge pull request #24327 from bogdanvlviv/patch-2	Rafael França	2016-03-29	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Update compatibility.rb	Bogdan	2016-03-26	1	-1/+1
* \| \| \| \|	Merge pull request #24350 from y-yagi/update_assert_no_performed_jobs_doc	Vipul A M	2016-03-30	1	-18/+5
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	update `assert_no_performed_jobs` doc to use `assert_no_performed_jobs` metho...	yuuji.yaginuma	2016-03-30	1	-18/+5
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #24315 from kenta-s/add_empty_to_finder_methods	Andrew White	2016-03-29	3	-1/+34
\|\ \ \ \
\| * \| \| \|	Delegate some additional methods in querying.rb	Kenta	2016-03-30	3	-1/+34
\| \|/ / /
* \| \| \|	Merge pull request #24354 from greysteil/fix-typo	Vipul A M	2016-03-29	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix typo in headers comment	Grey Baker	2016-03-29	1	-1/+1
* \| \| \|	Merge pull request #24344 from codeodor/patch-1	Vipul A M	2016-03-28	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Update how to clear the association cache	Sammy Larbi	2016-03-28	1	-2/+2
\|/ / /
* \| \|	Merge pull request #24343 from arekf/master	प्रथमेश Sonpatki	2016-03-28	1	-0/+2
\|\ \ \
\| * \| \|	[skip ci] Update `numericality` validation docs	Arkadiusz Fal	2016-03-28	1	-0/+2
\|/ / /
* \| \|	Merge pull request #24325 from y-yagi/show_correct_command_name_in_help_of_ra...	Kasper Timm Hansen	2016-03-27	1	-3/+4
\|\ \ \
\| * \| \|	show correct command name in help of rails runner	yuuji.yaginuma	2016-03-26	1	-3/+4
* \| \| \|	Merge pull request #24337 from xw19/realations-properly	Vipul A M	2016-03-27	1	-1/+1
\|\ \ \ \
\| * \| \| \|	[ci skip] relations inside <tt> tag	Sourav Moitra	2016-03-27	1	-1/+1
* \| \| \| \|	Merge pull request #24328 from bogdanvlviv/patch-3	Vipul A M	2016-03-27	1	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix description for method ActiveRecord::ConnectionAdapters::SchemaStatements...	Bogdan	2016-03-27	1	-2/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #24334 from mabras/master	Arun Agrawal	2016-03-27	1	-1/+0
\|\ \ \ \
\| * \| \| \|	remove old-dead link	Mohamad Abras	2016-03-27	1	-1/+0
\|/ / / /
* \| \| \|	Merge pull request #24333 from y-yagi/add_index_errors_option_to_example	Jon Moss	2016-03-26	1	-2/+2
\|\ \ \ \
\| * \| \| \|	add `:index_errors` option to example [ci skip]	yuuji.yaginuma	2016-03-27	1	-2/+2
\|/ / / /
* \| \| \|	Cable: Shush pop warnings when skipping Postgres tests.	Kasper Timm Hansen	2016-03-26	1	-0/+1
* \| \| \|	Shush up EM::Hiredis when running tests.	Kasper Timm Hansen	2016-03-26	1	-0/+11
\|/ / /
* \| \|	Merge pull request #24326 from mechanicles/highlight-word	प्रथमेश Sonpatki	2016-03-26	1	-1/+2
\|\ \ \
\| * \| \|	Highlight the dynamic method finder 'find_by_' [ci skip]	Santosh Wadghule	2016-03-26	1	-1/+2
* \| \| \|	Merge pull request #24323 from prathamesh-sonpatki/rm-check-for-development.rb	Matthew Draper	2016-03-26	1	-4/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	development.rb file always exists so we don't need a check for it	Prathamesh Sonpatki	2016-03-26	1	-4/+1
* \| \| \|	Merge pull request #24296 from laurmurclar/patch-1	Vipul A M	2016-03-25	1	-19/+19
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Correct typos in "Active Record Query Interface" guide	Laura Murphy-Clarkin	2016-03-25	1	-19/+19
\|/ / /
* \| \|	Merge pull request #24299 from kitop/activemodel-errors-include-fix	Kasper Timm Hansen	2016-03-25	2	-1/+8
\|\ \ \
\| * \| \|	Do not create a hash key when calling ActiveModel::Errors#include?	Esteban Pastorino	2016-03-24	2	-1/+8
* \| \| \|	Merge pull request #24313 from Gaurav2728/remove_unused_set_in_action_view_te...	Kasper Timm Hansen	2016-03-25	1	-1/+0
\|\ \ \ \
\| * \| \| \|	set in no more used in ActionView::Template::Types	Gaurav Sharma	2016-03-25	1	-1/+0
* \| \| \| \|	Merge pull request #24312 from prathamesh-sonpatki/fix-cl-typos	Kasper Timm Hansen	2016-03-25	2	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix typo in Action Pack changelog [ci skip]	Prathamesh Sonpatki	2016-03-25	2	-2/+2
\|/ / / /
* \| \| \|	Revert "Ensure `config.active_record.time_zone_aware_types` is always set"	Rafael Mendonça França	2016-03-24	1	-1/+0
* \| \| \|	Apply scale before precision when coercing floats to decimal	Sean Griffin	2016-03-24	2	-2/+17
* \| \| \|	Merge pull request #24292 from arthurnn/arthurnn/pk_sequence_klass	Arthur Nogueira Neves	2016-03-24	2	-2/+14
\|\ \ \ \
\| * \| \| \|	Move sequence value methods to Model level	Arthur Neves	2016-03-24	2	-2/+14