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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #21251 from rodzyn/more_param_parser_tests	Sean Griffin	2015-10-30	1	-0/+14
\|\
\| *	Add test for parsing application/vnd.api+json	Marcin Olichwirowicz	2015-08-21	1	-0/+14
* \|	Merge pull request #22128 from Sirupsen/config-for-env	Rafael França	2015-10-30	3	-2/+22
\|\ \
\| * \|	rails/application: allow passing an env to config_for	Simon Eskildsen	2015-10-30	3	-2/+22
\|/ /
* \|	don't sleep in tests	Aaron Patterson	2015-10-30	1	-10/+6
* \|	Merge pull request #22122 from samphilipd/sam/manual_locking_on_schema_migrat...	Sean Griffin	2015-10-30	8	-23/+322
\|\ \
\| * \|	Use advisory locks to prevent concurrent migrations	Sam Davies	2015-10-30	8	-23/+322
* \| \|	Fix test failures caused by #12071	Sean Griffin	2015-10-30	1	-10/+10
* \| \|	Merge pull request #11872 from AvnerCohen/log_namespace	Sean Griffin	2015-10-30	2	-1/+14
\|\ \ \
\| * \| \|	When logging Cache key, in debug mode, also log namespace, to create the full...	Avner Cohen	2015-06-23	2	-1/+14
* \| \| \|	Merge pull request #12071 from Crunch09/outer_joins	Sean Griffin	2015-10-30	7	-16/+176
\|\ \ \ \
\| * \| \| \|	added ActiveRecord::Relation#left_outer_joins	Florian Thomas	2015-05-19	7	-16/+176
* \| \| \| \|	Add version constraint to database gem in generated application	Rafael Mendonça França	2015-10-29	4	-17/+32
* \| \| \| \|	Revert "ActionController::Base#process() now only takes an action name"	Aaron Patterson	2015-10-29	3	-6/+22
* \| \| \| \|	Ensure `has_and_belongs_to_many` works with `belongs_to_required_by_default`	Sean Griffin	2015-10-29	3	-2/+16
* \| \| \| \|	ActionController::Base#process() now only takes an action name	Aaron Patterson	2015-10-29	3	-22/+6
* \| \| \| \|	switch to JSON.dump to avoid infinite recursion	Aaron Patterson	2015-10-29	1	-1/+1
* \| \| \| \|	Add a changelog entry for #13008	Sean Griffin	2015-10-29	1	-0/+4
* \| \| \| \|	Merge pull request #13008 from ktheory/sanitize_order	Sean Griffin	2015-10-29	2	-0/+12
\|\ \ \ \ \
\| * \| \| \| \|	Support SQL sanitization in AR::QueryMethods#order	Aaron Suggs	2013-11-22	2	-0/+12
* \| \| \| \| \|	use `dispatch` instead of `process` to run requests though	eileencodes	2015-10-29	2	-8/+8
* \| \| \| \| \|	Remove unnecessary method	eileencodes	2015-10-29	1	-3/+0
* \| \| \| \| \|	Merge pull request #19511 from larskanis/replace_const_conn_params	Sean Griffin	2015-10-29	1	-7/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	PostgreSQL, Replace static connection param list by the one built into libpq.	Lars Kanis	2015-03-25	1	-7/+2
* \| \| \| \| \| \|	Merge pull request #22121 from gocardless/patch-2	Andrew White	2015-10-29	2	-12/+10
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Don't disable errors when turning standard_conforming_strings on	Harry Marr	2015-10-29	2	-12/+10
* \| \| \| \| \| \| \|	Merge pull request #22119 from philr/time_with_zone_documentation	Andrew White	2015-10-29	1	-4/+42
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix the example given in the documentation for TimeWithZone#-	Phil Ross	2015-10-29	1	-4/+4
\| * \| \| \| \| \| \|	Add documentation for TimeWithZone #ago and #advance.	Phil Ross	2015-10-29	1	-0/+38
* \| \| \| \| \| \| \|	Never pass `nil` to `order`	Sean Griffin	2015-10-29	5	-22/+7
* \| \| \| \| \| \| \|	Merge pull request #22106 from jamis/fix_default_fixture_class_names	Yves Senn	2015-10-29	2	-3/+15
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	FixtureSet.fixture_class_names should have no default value	Jamis Buck	2015-10-29	2	-3/+15
* \| \| \| \| \| \| \|	Add CHANGELOG entry for #22101 [ci skip]	Andrew White	2015-10-29	1	-0/+10
* \| \| \| \| \| \| \|	Merge pull request #16252 from leckylao/actionview-date-helpers-selected-valu...	Sean Griffin	2015-10-29	3	-1/+30
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix style issues with #16252	Sean Griffin	2015-10-29	2	-12/+9
\| * \| \| \| \| \| \| \|	making selected value to accept Hash like the default option. E.g. selected: ...	Lecky Lao	2015-10-29	3	-1/+33
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Revert "Revert "Merge pull request #22026 from akihiro17/fix-preload-associat...	Yves Senn	2015-10-29	3	-0/+28
* \| \| \| \| \| \| \|	Merge pull request #22101 from gocardless/ar-pgbouncer-fix	Andrew White	2015-10-29	1	-4/+5
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Check standard_conforming_strings is not readonly	Harry Marr	2015-10-29	1	-1/+1
\| * \| \| \| \| \| \| \|	Avoid disabling postgres errors	Harry Marr	2015-10-28	1	-4/+5
* \| \| \| \| \| \| \| \|	Revert "Merge pull request #22026 from akihiro17/fix-preload-association"	Sean Griffin	2015-10-29	3	-28/+0
* \| \| \| \| \| \| \| \|	Merge pull request #22118 from cllns/fix-spacing-in-layout-template	Rafael França	2015-10-29	1	-16/+17
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Properly indent '<head>' and '<body>' within '<html>'	Sean Collins	2015-10-29	1	-16/+17
* \| \| \| \| \| \| \| \| \|	Deprecate `HWIDA.new_from_hash_copying_default`	Sean Griffin	2015-10-29	2	-1/+6
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #16357 from gchan/hwia-respects-to-hash-default	Sean Griffin	2015-10-29	4	-8/+32
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	`HashWithIndifferentAccess.new` respects the default value or proc on objects...	Gordon Chan	2014-07-31	4	-8/+32
* \| \| \| \| \| \| \| \| \|	Merge pull request #19501 from ccutrer/dry_sti_subclass_finding2	Sean Griffin	2015-10-29	6	-23/+30
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Fix a stylistic nitpick in #19501	Sean Griffin	2015-10-29	1	-3/+3
\| * \| \| \| \| \| \| \| \| \|	Fix test failures caused by #19501	Sean Griffin	2015-10-29	3	-1/+3
\| * \| \| \| \| \| \| \| \| \|	Fix merge conflicts from #19501	Sean Griffin	2015-10-29	4	-23/+28
\| \|\ \ \ \ \ \ \ \ \ \