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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \| \|	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