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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23375 from prathamesh-sonpatki/fix-19835	Rafael França	2016-02-01	2	-13/+6
\|\
\| *	Fix documentation related to `config.assets.cache_store` [ci skip]	Prathamesh Sonpatki	2016-02-01	2	-13/+6
* \|	tabenai (typo)	Akira Matsuda	2016-02-01	1	-6/+6
* \|	Merge pull request #23391 from erullmann/join_table_indexes	Rafael França	2016-02-01	1	-0/+4
\|\ \
\| * \|	Added references option to join tables	Ernst Rullmann	2016-01-31	1	-0/+4
* \| \|	Merge pull request #23168 from kamipo/avoid_extra_show_variables_in_migration	Rafael França	2016-02-01	5	-21/+15
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Avoid extra `show variables` in migration	Ryuta Kamizono	2016-02-01	5	-21/+15
\|/ /
* \|	Merge pull request #23359 from kamipo/make_to_primary_key	Rafael França	2016-02-01	4	-40/+5
\|\ \
\| * \|	Make to primary key instead of an unique index for internal tables	Ryuta Kamizono	2016-01-31	4	-40/+5
* \| \|	Remove development dependencies from actioncable.gemspec	Matthew Draper	2016-02-01	1	-9/+0
* \| \|	Merge pull request #23373 from kamipo/remove_duplicated_composite_primary_key...	Rafael França	2016-02-01	3	-17/+1
\|\ \ \
\| * \| \|	Remove duplicated composite primary key tests	Ryuta Kamizono	2016-02-01	3	-17/+1
* \| \| \|	Merge pull request #23389 from kamipo/extract_explain_pretty_printer	Rafael França	2016-02-01	7	-119/+137
\|\ \ \ \
\| * \| \| \|	Extract `ExplainPrettyPrinter` to appropriate files	Ryuta Kamizono	2016-02-01	7	-119/+137
\| \|/ / /
* / / /	Revert "Merge pull request #23366 from maclover7/add-configuation-ar-docs"	Rafael Mendonça França	2016-02-01	1	-102/+0
\|/ / /
* \| \|	Merge pull request #23372 from kamipo/use_index_in_create_in_test_schema	Rafael França	2016-02-01	2	-11/+9
\|\ \ \
\| * \| \|	Use `t.index` in `create_table` instead of `add_index` in test schema	Ryuta Kamizono	2016-01-31	2	-11/+9
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #23374 from prathamesh-sonpatki/migration-compatiblity-tests	Rafael França	2016-01-31	1	-0/+30
\|\ \ \
\| * \| \|	Added test for backward compatibility of null constraints on timestamp columns	Prathamesh Sonpatki	2016-01-31	1	-0/+30
\| \|/ /
* \| \|	:speak_no_evil: :warning:	Akira Matsuda	2016-02-01	2	-2/+6
* \| \|	Merge pull request #23360 from kamipo/oid_money_precision_is_unused	Rafael França	2016-01-31	2	-8/+0
\|\ \ \
\| * \| \|	`OID::Money.precision` is unused since #15239	Ryuta Kamizono	2016-01-31	2	-8/+0
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #23388 from prathamesh-sonpatki/update-gemfile-lock	Rafael França	2016-01-31	1	-1/+0
\|\ \ \
\| * \| \|	Update Gemfile.lock	Prathamesh Sonpatki	2016-02-01	1	-1/+0
\|/ / /
* \| \|	Merge pull request #23380 from yui-knk/override_calculate_constructables_at_e...	Arthur Nogueira Neves	2016-01-31	1	-8/+13
\|\ \ \
\| * \| \|	Remove `case macro` from `calculate_constructable`	yui-knk	2016-02-01	1	-8/+13
\|/ / /
* \| \|	Merge pull request #23387 from mcfiredrill/clarify-touching-callbacks	Kasper Timm Hansen	2016-01-31	1	-0/+2
\|\ \ \
\| * \| \|	clarify the touch true option does not trigger after_save/update [ci skip]	Tony Miller	2016-02-01	1	-0/+2
* \| \| \|	Merge pull request #23370 from maclover7/actioncable-main-travis-build	Guillermo Iguaran	2016-01-31	2	-10/+0
\|\ \ \ \
\| * \| \| \|	Remove unused method	Jon Moss	2016-01-31	1	-9/+0
\| * \| \| \|	Move Action Cable back to the main build	Jon Moss	2016-01-30	1	-1/+0
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #22857 from bdewater/interlock-doc	Vipul A M	2016-02-01	4	-8/+9
\|\ \ \ \
\| * \| \| \|	Update middleware docs regarding ActionDispatch::LoadInterlock [ci skip]	Bart de Water	2016-01-31	4	-9/+10
* \| \| \| \|	Merge pull request #23169 from y-yagi/rake_proxy_in_engine	Kasper Timm Hansen	2016-01-31	6	-40/+127
\|\ \ \ \ \
\| * \| \| \| \|	make rake proxy work in rails engines	yuuji.yaginuma	2016-01-31	6	-40/+127
* \| \| \| \| \|	Merge pull request #23379 from yui-knk/define_association_class_on_each_concr...	Kasper Timm Hansen	2016-01-31	1	-22/+25
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Each concrete classes have responsibility to return `association_class`	yui-knk	2016-01-31	1	-22/+25
* \| \| \| \| \| \|	Drop the runtime dependency on coffee-rails	Matthew Draper	2016-02-01	1	-1/+0
* \| \| \| \| \| \|	Wrangle the asset build into something that sounds more general	Matthew Draper	2016-02-01	18	-17/+51
* \| \| \| \| \| \|	Merge pull request #23369 from maclover7/actioncable-assets-redux	Matthew Draper	2016-02-01	11	-7/+49
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add Action Cable asset building as release step	Jon Moss	2016-01-30	1	-0/+1
\| * \| \| \| \| \| \|	Improvements and reorganization of assets	Jon Moss	2016-01-30	10	-3/+10
\| * \| \| \| \| \| \|	Add task to create precompiled action_cable.js and reorganize to accommodate	Javan Makhmali	2016-01-30	10	-7/+41
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #23368 from y-yagi/remove_backward_compatibility_code_for_...	Santiago Pastorino	2016-01-31	1	-3/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	remove backward compatibility code for Minitest 4	yuuji.yaginuma	2016-01-30	1	-3/+0
* \| \| \| \| \| \| \|	Wait for EventMachine to finish starting	Matthew Draper	2016-02-01	1	-0/+1
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #23371 from kamipo/remove_odd_backtick	Vipul A M	2016-01-31	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Remove odd ` [ci skip]	Ryuta Kamizono	2016-01-31	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #23366 from maclover7/add-configuation-ar-docs	Jon Moss	2016-01-30	1	-0/+102
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Add configuration section to "Active Record Basics" guide	Jon Moss	2016-01-30	1	-0/+102
\|/ / / / /