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

	Commit message (Expand)	Author	Age	Files	Lines
*	Use the most highest priority exception handler when cause is set	Sean Griffin	2016-03-11	3	-2/+49
*	Fix test failures caused by #23958	Sean Griffin	2016-03-11	1	-1/+1
*	Merge pull request #22854 from jcoyne/missing_template	Sean Griffin	2016-03-11	3	-1/+23
\|\
\| *	Render default template if block doesn't render	Justin Coyne	2016-02-25	3	-1/+23
* \|	Merge pull request #24150 from exviva/unmarshal-infinite-retry	Xavier Noria	2016-03-11	3	-1/+20
\|\ \
\| * \|	Prevent `Marshal.load` from looping infinitely	Olek Janiszewski	2016-03-11	3	-1/+20
* \| \|	Merge pull request #24143 from perceptec/fix-thread-mattr-accessor-refs	Matthew Draper	2016-03-12	2	-2/+8
\|\ \ \
\| * \| \|	Fix `thread_mattr_accessor` thread-local variable naming	Michael Ryan	2016-03-11	2	-2/+8
\| \|/ /
* \| \|	Merge pull request #24054 from kamipo/extract_default_primary_key	Rafael França	2016-03-11	5	-22/+22
\|\ \ \
\| * \| \|	Extract `default_primary_key?` to refactor `column_spec_for_primary_key`	Ryuta Kamizono	2016-03-11	5	-22/+22
\| \|/ /
* \| \|	Merge pull request #24087 from kamipo/dump_bigint_instead_of_integer_limit_8	Rafael França	2016-03-11	4	-13/+13
\|\ \ \
\| * \| \|	Dump `bigint` instead of `integer` with `limit: 8` for schema dumper	Ryuta Kamizono	2016-03-11	4	-13/+13
\| \|/ /
* \| \|	Merge pull request #23677 from kamipo/passing_table_name_to_column_initialize	Rafael França	2016-03-11	9	-29/+58
\|\ \ \
\| * \| \|	Passing `table_name` to `Column#initialize` to avoid `instance_variable_set`	Ryuta Kamizono	2016-03-08	5	-17/+11
\| * \| \|	Initialize `column.table_name` immediately for `column.serial?` correctly wor...	Ryuta Kamizono	2016-03-08	8	-21/+56
* \| \| \|	Merge pull request #24153 from y-yagi/use_activesupport_reloader	Kasper Timm Hansen	2016-03-11	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	use `ActiveSupport::Reloader.to_prepare` instead of deprecated `ActionDispatc...	yuuji.yaginuma	2016-03-11	1	-1/+1
\|/ / /
* \| \|	Merge pull request #23958 from kamipo/fix_bigserial_appears_with_limit_8	Rafael França	2016-03-11	2	-2/+6
\|\ \ \
\| * \| \|	Fix bigserial appears with limit 8 for schema dumper	Ryuta Kamizono	2016-03-04	2	-2/+6
* \| \| \|	Merge pull request #24129 from dharamgollapudi/rename_dependencies_rake	Rafael França	2016-03-11	2	-1/+1
\|\ \ \ \
\| * \| \| \|	Rename dependencies.rake to cache_digests.rake	Dharam Gollapudi	2016-03-09	2	-1/+1
* \| \| \| \|	Add missing require to try	Rafael Mendonça França	2016-03-11	1	-0/+2
* \| \| \| \|	Merge pull request #24145 from bdewater/remove_try_require	Rafael França	2016-03-11	1	-1/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove unused try require	Bart de Water	2016-03-10	1	-1/+0
* \| \| \| \| \|	Remove unfinished command infrastructure.	Kasper Timm Hansen	2016-03-10	2	-72/+2
\|/ / / / /
* \| \| \| \|	Fix Gemfile.lock	Rafael Mendonça França	2016-03-10	1	-5/+4
* \| \| \| \|	Merge pull request #24144 from tjschuck/bcrypt_on_windows_fixed	Rafael França	2016-03-10	1	-7/+1
\|\ \ \ \ \
\| * \| \| \| \|	Version 3.1.11 works on Windows again	T.J. Schuck	2016-03-10	1	-7/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #24140 from gregmolnar/guides	Vipul A M	2016-03-10	1	-5/+3
\|\ \ \ \ \
\| * \| \| \| \|	remove obsolete i18n links from guides [ci skip]	Greg Molnar	2016-03-10	1	-5/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #24137 from sidonath/patch-1	Rafael França	2016-03-10	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	[skip ci] Reorder paragraphs	Damir	2016-03-10	1	-3/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #24134 from kamipo/remove_needless_break	Rafael França	2016-03-10	1	-1/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove needless `break;` [ci skip]	Ryuta Kamizono	2016-03-10	1	-1/+0
* \| \| \| \| \|	Merge pull request #24136 from salmanasiddiqui/patch-1	प्रथमेश Sonpatki	2016-03-10	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fixed comments of add_foreign_key method	Salman Afzal Siddiqui	2016-03-10	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	revises whitespace in the gemspec of AV [ci skip]	Xavier Noria	2016-03-10	1	-4/+4
* \| \| \| \| \|	revises the homepage URL in the gemspecs [ci skip]	Xavier Noria	2016-03-10	8	-8/+8
* \| \| \| \| \|	prefer require_relative over require + File.expand_path	Xavier Noria	2016-03-10	1	-1/+1
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #24128 from y-yagi/add_return_values_to_example	Rafael França	2016-03-09	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	add return values to example [ci skip]	yuuji.yaginuma	2016-03-10	1	-1/+1
\|/ / / / /
* \| \| \| \|	Revert "Merge pull request #24125 from dharamgollapudi/patch-3"	Matthew Draper	2016-03-10	1	-0/+0
* \| \| \| \|	Merge pull request #24125 from dharamgollapudi/patch-3	Rafael França	2016-03-09	1	-0/+0
\|\ \ \ \ \
\| * \| \| \| \|	Rename dependencies.rake to cache_digests.rake	Dharam Gollapudi	2016-03-09	1	-0/+0
\|/ / / / /
* \| \| \| \|	Merge pull request #23940 from prathamesh-sonpatki/rm-with-dispatchers	Rafael França	2016-03-09	2	-14/+15
\|\ \ \ \ \
\| * \| \| \| \|	Remove passing `with_dispatchers` to AppGenerator	Prathamesh Sonpatki	2016-03-09	2	-14/+15
* \| \| \| \| \|	Merge pull request #24123 from mperham/master	Rafael França	2016-03-09	2	-6/+21
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add JSON round trip verification testcase	Mike Perham	2016-03-09	2	-2/+17
\| * \| \| \| \| \|	Job payload should be symmetric across JSON dump/load	Mike Perham	2016-03-09	2	-4/+4
* \| \| \| \| \| \|	Merge pull request #24121 from y-yagi/use_same_to_type_object	Rafael França	2016-03-09	2	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|