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

	Commit message (Expand)	Author	Age	Files	Lines
*	[ci skip] Make collection caching explicit in guides.	Kasper Timm Hansen	2016-03-03	1	-15/+6
*	Merge pull request #23992 from matthewd/em-option	Matthew Draper	2016-03-04	31	-52/+229
\|\
\| *	Support faye-websocket + EventMachine as an option	Matthew Draper	2016-03-02	31	-52/+229
* \|	don't treat all associations with extensions as instance dependent.	Yves Senn	2016-03-03	4	-1/+33
* \|	Merge pull request #24027 from mechanicles/a-to-an	Xavier Noria	2016-03-03	7	-12/+12
\|\ \
\| * \|	Change 'a HTTP' to 'an HTTP' [ci skip]	Santosh Wadghule	2016-03-03	7	-12/+12
* \| \|	Merge pull request #24024 from jonatack/niceify-dynamic-routes-deprecation-me...	Rafael França	2016-03-03	1	-2/+8
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Niceify the dynamic routes deprecation messages	Jon Atack	2016-03-03	1	-2/+8
* \| \|	Merge pull request #24025 from mechanicles/a-to-an	Jon Moss	2016-03-03	1	-1/+1
\|\ \ \
\| * \| \|	Change 'a HTML' to 'an HTML' [ci skip]	Santosh Wadghule	2016-03-03	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #24023 from danielrhodes/bug/ac-connection-monitor-disconnect	Matthew Draper	2016-03-04	2	-0/+2
\|\ \ \
\| * \| \|	ConnectionMonitor is once again notified of disconnect	Daniel Rhodes	2016-03-03	2	-0/+2
\| \|/ /
* / /	Prevent nested ExecutionWrapper calls even when using run! directly	Matthew Draper	2016-03-04	2	-9/+16
\|/ /
* \|	Merge pull request #24015 from meinac/active_record_migrations_doc_changes	Rafael França	2016-03-02	1	-1/+1
\|\ \
\| * \|	Changed behaviour of timestamps helper by create_table migration generator [c...	Mehmet Emin İNAÇ	2016-03-03	1	-1/+1
\|/ /
* \|	Merge pull request #24011 from gsamokovarov/ar-persistence-api-docs-fix	Rafael França	2016-03-02	1	-1/+1
\|\ \
\| * \|	Fix a small template misrender in ActiveRecord::Persistence	Genadi Samokovarov	2016-03-02	1	-1/+1
\|/ /
* \|	Merge pull request #23086 from kamipo/deprecate_insert_update_delete_sql	Rafael França	2016-03-02	5	-60/+17
\|\ \
\| * \|	Deprecate `{insert\|update\|delete}_sql` in `DatabaseStatements`	Ryuta Kamizono	2016-03-02	5	-60/+17
* \| \|	Do not run app.executor callbacks in integration tests	Jorge Bejar and Santiago Pastorino	2016-03-02	1	-11/+2
* \| \|	Fix CHANGELOG spacing [ci skip]	Jeremy Daer	2016-03-02	4	-20/+20
* \| \|	Add test to make sure the sprockets cache is not shared per environment	Rafael Mendonça França	2016-03-02	2	-2/+22
* \| \|	Merge pull request #24009 from yahonda/bundle_exec_activerecord_unittest	Rafael França	2016-03-02	1	-3/+3
\|\ \ \
\| * \| \|	[ci skip] Add `bundle exec` for ActiveRecord unit tests	Yasuo Honda	2016-03-02	1	-3/+3
* \| \| \|	Merge pull request #24001 from 5t111111/fix-gsub-cookies_serializer	Rafael França	2016-03-02	2	-2/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix description in cookies_serializer.rb being corrupted when updating	Hirofumi Wakasugi	2016-03-02	2	-2/+3
* \| \| \|	remove trailing whitespace.	Yves Senn	2016-03-02	1	-1/+1
* \| \| \|	Merge pull request #24002 from 5t111111/fix-typo-in-app_generator_test	Rafael França	2016-03-02	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix typo in app_generator_test.rb	Hirofumi Wakasugi	2016-03-02	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #23999 from maxehmookau/patch-1	Rafael França	2016-03-02	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix typo in implicit_render	Max Woolf	2016-03-02	1	-1/+1
* \| \| \| \|	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