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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23088 from prathamesh-sonpatki/update-gemfile-lock	Santiago Pastorino	2016-01-18	1	-2/+1
\|\
\| *	Checked in changes to Gemfile.lock on latest master	Prathamesh Sonpatki	2016-01-17	1	-2/+1
* \|	Merge pull request #22394 from j-dexx/update_association_basics_guide	Jon Moss	2016-01-18	1	-3/+13
\|\ \
\| * \|	Updated the guides for having a distinct has_many through at the database level	James Doyley	2016-01-18	1	-3/+13
* \| \|	Merge pull request #23096 from HayleyCAnderson/ha-action-cable-docs	Jon Moss	2016-01-18	1	-20/+31
\|\ \ \
\| * \| \|	Improve Action Cable configuration explanations	Hayley Anderson	2016-01-18	1	-20/+31
* \| \| \|	Merge pull request #23097 from prathamesh-sonpatki/psql-hstore	Yves Senn	2016-01-18	1	-0/+4
\|\ \ \ \
\| * \| \| \|	Explain how HStore columns can be queried [ci skip]	Prathamesh Sonpatki	2016-01-18	1	-0/+4
* \| \| \| \|	Merge pull request #23098 from vipulnsward/changelog-pass	Kasper Timm Hansen	2016-01-18	1	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Pass through AP CHANGELOG [ci skip]	Vipul A M	2016-01-18	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #23085 from maclover7/fix-17030	Kasper Timm Hansen	2016-01-17	4	-4/+4
\|\ \ \ \
\| * \| \| \|	Remove ActionView dependence on ActionPack's Mime implementation	Jon Moss	2016-01-17	4	-4/+4
\|/ / / /
* \| \| \|	Merge pull request #23089 from kaspth/better-template-types	Kasper Timm Hansen	2016-01-17	1	-15/+14
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Store the symbols as an array.	Kasper Timm Hansen	2016-01-17	1	-1/+1
\| * \| \|	Enrich the SET constant to respond to symbols.	Kasper Timm Hansen	2016-01-17	1	-1/+5
\| * \| \|	Don't bother looking up the types.	Kasper Timm Hansen	2016-01-17	1	-3/+3
\| * \| \|	Replace class attribute with SET constant.	Kasper Timm Hansen	2016-01-17	1	-3/+2
\| * \| \|	Remove register abstraction.	Kasper Timm Hansen	2016-01-17	1	-7/+1
\| * \| \|	Replace delegate calls with standard method defs.	Kasper Timm Hansen	2016-01-17	1	-1/+4
\| * \| \|	Spare to_sym call in `==`.	Kasper Timm Hansen	2016-01-17	1	-2/+1
\| * \| \|	Make ref return the internal symbol.	Kasper Timm Hansen	2016-01-17	1	-1/+1
\|/ / /
* \| \|	Remove literal? check to fix issue with prefixed optionals	eileencodes	2016-01-16	2	-1/+13
* \| \|	Merge pull request #23008 from tawan/avoid-multiple-default-paths	Eileen M. Uchitelle	2016-01-16	2	-1/+12
\|\ \ \
\| * \| \|	Avoid multiple default paths to server.pid file	Tawan Sierek	2016-01-16	2	-1/+12
\|/ / /
* \| \|	Fix the updated API (this sorts the concurrent-ruby switch with Basecamp)	David Heinemeier Hansson	2016-01-16	1	-1/+1
* \| \|	Revert "Merge pull request #22977 from rails/revert-22934-master"	David Heinemeier Hansson	2016-01-16	15	-36/+46
* \| \|	Merge pull request #20046 from yoongkang/ladida	Rafael Mendonça França	2016-01-16	3	-1/+20
\|\ \ \
\| * \| \|	Use ActiveSupport::SafeBuffer when flushing content_for	Yoong Kang Lim	2015-05-25	3	-1/+20
* \| \| \|	Merge pull request #20005 from kamipo/default_expression_support	Rafael França	2016-01-16	11	-44/+100
\|\ \ \ \
\| * \| \| \|	Fix extract default with CURRENT_TIMESTUMP	Ryuta Kamizono	2016-01-13	3	-2/+24
\| * \| \| \|	Fix extract default with CURRENT_DATE	Ryuta Kamizono	2016-01-13	1	-3/+8
\| * \| \| \|	Add expression support on the schema default	Ryuta Kamizono	2016-01-13	8	-39/+68
* \| \| \| \|	Merge pull request #22985 from akshay-vishnoi/fix-typo	Rafael França	2016-01-16	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	test `include?`- fix typo	Akshay Vishnoi	2016-01-09	1	-1/+1
* \| \| \| \| \|	Merge pull request #23067 from kamipo/sql_for_insert_returns_values_for_passi...	Rafael França	2016-01-16	3	-24/+16
\|\ \ \ \ \ \
\| * \| \| \| \| \|	`sql_for_insert` returns values for passing to `exec_insert`	Ryuta Kamizono	2016-01-15	3	-24/+16
* \| \| \| \| \| \|	Merge pull request #23079 from y-yagi/fix_log_clear_example	Rafael França	2016-01-16	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	remove unnecessary `ENV[]` from `log:clear` example [ci skip]	yuuji.yaginuma	2016-01-16	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #23060 from schneems/schneems/revert-revert-migration-set-...	Richard Schneeman	2016-01-15	2	-19/+59
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix intermittent test failures	schneems	2016-01-14	1	-0/+1
\| * \| \| \| \| \| \|	Revert "Revert "Set environment even when no migration runs""	schneems	2016-01-14	2	-19/+58
* \| \| \| \| \| \| \|	Merge pull request #22278 from poporul/master	Godfrey Chan	2016-01-15	2	-6/+14
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Allow to store .keep file in cache directory	Alexey Pokhozhaev	2015-11-13	2	-6/+14
* \| \| \| \| \| \| \| \|	Merge pull request #23071 from khundawg/dave_moore/update-docs-ActionCable__C...	Jon Moss	2016-01-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	[ci skip] Fix typo in docs	DAVID MOORE	2016-01-15	1	-1/+1
* \| \| \| \| \| \| \| \| \|	Merge pull request #23065 from kamipo/clean_up_internal_metadata_definition	Richard Schneeman	2016-01-15	2	-4/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Clean up internal metadata definition	Ryuta Kamizono	2016-01-15	2	-4/+3
* \| \| \| \| \| \| \| \| \|	Merge pull request #23068 from kamipo/remove_unused_last_insert_id_value	Sean Griffin	2016-01-15	1	-9/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	`last_insert_id_value` and `last_insert_id` are unused anymore	Ryuta Kamizono	2016-01-15	1	-9/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #23014 from jonatack/improve-generated-config-files	Rafael França	2016-01-15	2	-4/+6
\|\ \ \ \ \ \ \ \ \