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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23679 from kamipo/remove_not_needed_exec_insert	Yves Senn	2016-03-02	1	-4/+0
\|\
\| *	Remove not needed `exec_insert` in mysql2 adapter	Ryuta Kamizono	2016-03-02	1	-4/+0
* \|	Merge pull request #24003 from abhishekjain16/rails_routes_fix	Rafael França	2016-03-02	1	-9/+9
\|\ \
\| * \|	[ci skip] Use rails routes instead of rake routes in inspector test description	Abhishek Jain	2016-03-02	1	-9/+9
* \| \|	Merge pull request #23649 from maclover7/fix-22675	David Heinemeier Hansson	2016-03-02	4	-8/+27
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Accept JSON with no backslashes/escaping	Jon Moss	2016-03-02	4	-8/+27
\|/ /
* \|	Merge pull request #23976 from danielrhodes/enhancement/ac-ping-to-message-type	Matthew Draper	2016-03-02	7	-19/+24
\|\ \
\| * \|	Make ping into a message type	Daniel Rhodes	2016-03-01	6	-15/+10
\| * \|	Added welcome message type and fix test hacks	Daniel Rhodes	2016-03-01	5	-5/+14
* \| \|	Merge pull request #23998 from prathamesh-sonpatki/rm-load-paths	Kasper Timm Hansen	2016-03-02	1	-1/+4
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Remove requiring load_paths from tools/test.rb	Prathamesh Sonpatki	2016-03-02	1	-1/+4
\|/ /
* \|	Merge pull request #23991 from kamipo/fix_activesupport_reloader	Matthew Draper	2016-03-02	1	-4/+3
\|\ \
\| * \|	Fix `ActiveSupport::Reloader.check!`	Ryuta Kamizono	2016-03-02	1	-4/+3
* \| \|	Merge pull request #23932 from arthurnn/arthurnn/remove_load_paths	Arthur Nogueira Neves	2016-03-01	15	-43/+5
\|\ \ \
\| * \| \|	Remove load_paths file	Arthur Neves	2016-02-27	15	-43/+5
* \| \| \|	Merge pull request #23990 from kamipo/remove_duplicated_test_prefix	Rafael França	2016-03-01	2	-2/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Remove duplicated `test_` prefix [ci skip]	Ryuta Kamizono	2016-03-02	2	-2/+2
\|/ / /
* \| \|	Merge pull request #23959 from kamipo/add_test_primary_key_should_be_not_null	Rafael França	2016-03-01	1	-3/+4
\|\ \ \
\| * \| \|	Add a test for primary key should be not null	Ryuta Kamizono	2016-02-29	1	-3/+4
* \| \| \|	Merge pull request #23961 from kamipo/exclude_name_and_type_from_prepare_colu...	Rafael França	2016-03-01	3	-8/+8
\|\ \ \ \
\| * \| \| \|	Exclude `:name` and `:type` from `prepare_column_options`	Ryuta Kamizono	2016-02-29	3	-8/+8
\| \|/ / /
* \| \| \|	Merge pull request #23953 from kamipo/fix_tests_failure_with_prepared_stateme...	Rafael França	2016-03-01	12	-136/+96
\|\ \ \ \
\| * \| \| \|	Remove unnecessary namespaces in `explain_test.rb`	Ryuta Kamizono	2016-02-29	3	-40/+28
\| * \| \| \|	Fix tests failure with `prepared_statements: false`	Ryuta Kamizono	2016-02-29	10	-97/+69
\| * \| \| \|	Fix `NoMethodError: undefined method `preparable'`	Ryuta Kamizono	2016-02-29	1	-1/+1
* \| \| \| \|	Merge pull request #23954 from kamipo/fix_undefined_method_fields	Rafael França	2016-03-01	2	-1/+19
\|\ \ \ \ \
\| * \| \| \| \|	Fix `NoMethodError: undefined method `fields' for nil:NilClass`	Ryuta Kamizono	2016-02-29	2	-1/+19
* \| \| \| \| \|	Revert "Merge pull request #23927 from gaurish/jruby_ci_actionpack"	Rafael Mendonça França	2016-03-01	1	-5/+0
* \| \| \| \| \|	Merge pull request #23935 from y-yagi/convert_cable_coffee_to_javascript	Rafael França	2016-03-01	6	-13/+17
\|\ \ \ \ \ \
\| * \| \| \| \| \|	convert cable.coffee to cable.js	yuuji.yaginuma	2016-02-28	6	-13/+17
* \| \| \| \| \| \|	Merge pull request #23936 from yui-knk/local_constants_to_be_public	Rafael Mendonça França	2016-03-01	5	-26/+17
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Deprecate `Module.local_constants`	yui-knk	2016-03-01	5	-26/+17
* \| \| \| \| \| \| \|	Merge pull request #23417 from sgringwe/master	Rafael Mendonça França	2016-03-01	5	-9/+81
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add initial support for allowing an error on order or limit of queries being ...	Scott Ringwelski	2016-02-02	5	-9/+81
* \| \| \| \| \| \| \| \|	Merge pull request #23980 from rails/deprecate-controller-action-segments	Andrew White	2016-03-01	32	-213/+478
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Deprecate :controller and :action path parameters	Andrew White	2016-03-01	32	-213/+478
* \| \| \| \| \| \| \| \| \|	Merge pull request #23981 from y-yagi/do_not_set_action_cable_config	Rafael França	2016-03-01	1	-4/+3
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	do not set Action Cable's config when specify `--skip-action-cable` option	yuuji.yaginuma	2016-03-01	1	-4/+3
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #23986 from rubys/dedup-ctrlc-msg	Eileen M. Uchitelle	2016-03-01	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Delete CTRL-C message as is duplicates Puma	Sam Ruby	2016-03-01	1	-2/+0
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #23807 from matthewd/executor	Matthew Draper	2016-03-02	47	-337/+897
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Don't reference Rails.application from inside a component	Matthew Draper	2016-03-02	2	-10/+8
\| * \| \| \| \| \| \| \| \| \| \|	Use AS::Reloader to support reloading in ActiveJob	Matthew Draper	2016-03-02	4	-2/+23
\| * \| \| \| \| \| \| \| \| \| \|	Use AS::Executor / AS::Reloader to support reloading in ActionCable	Matthew Draper	2016-03-02	9	-30/+96
\| * \| \| \| \| \| \| \| \| \| \|	Publish AS::Executor and AS::Reloader APIs	Matthew Draper	2016-03-02	33	-307/+782
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #23598 from brchristian/activerecord_second_to_last	Matthew Draper	2016-03-02	2	-4/+83
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	default second_to_last to primary_key index if no order supplied	Brian Christian	2016-02-27	1	-1/+7
\| * \| \| \| \| \| \| \| \| \| \| \|	refactor AR second_to_last to use array methods	Brian Christian	2016-02-27	1	-1/+6
\| * \| \| \| \| \| \| \| \| \| \| \|	comment out failing .second and .third tests	Brian Christian	2016-02-27	1	-3/+3
\| * \| \| \| \| \| \| \| \| \| \| \|	adding additional tests for offset and limit behavior	Brian Christian	2016-02-27	1	-0/+8