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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into bug/filtered_parameters_class	Leonel Galán	2017-04-03	18	-20/+797
\|\
\| *	Merge pull request #28606 from maclover7/jm-fix-25820	Andrew White	2017-03-30	2	-0/+57
\| \|\
\| \| *	Do not include default response headers for AC::Metal	Jon Moss	2017-03-29	2	-0/+57
\| * \|	Merge pull request #28603 from mikeastock/alias-reverse-merge	Sean Griffin	2017-03-29	1	-0/+16
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Add aliases for reverse_merge to with_defaults	Matt Casper	2017-03-29	1	-0/+16
\| * \|	Add test to make sure subclasses also get helpers	Rafael Mendonça França	2017-03-29	1	-0/+16
\| \|/
\| *	Make `driven_by` overridable	Fumiaki MATSUSHIMA	2017-03-29	1	-0/+8
\| *	Merge pull request #28514 from y-yagi/follow_up_to_28056	Andrew White	2017-03-28	1	-8/+10
\| \|\
\| \| *	Fix store accessors in parameters test	yuuji.yaginuma	2017-03-22	1	-8/+10
\| * \|	Make sure that ActionController::Api can include helpers	Rafael Mendonça França	2017-03-27	1	-0/+26
\| \|/
\| *	Merge pull request #28056 from sngeth/wrap_store_accessors_in_params	Rafael França	2017-03-21	1	-0/+13
\| \|\
\| \| *	Wrap store accessors in parameters	Sid Ngeth	2017-03-21	1	-0/+13
\| * \|	Fix test assertion	Rafael Mendonça França	2017-03-21	1	-1/+1
\| * \|	Fix test that was asserting the wrong thing	Rafael Mendonça França	2017-03-21	1	-1/+1
\| \|/
\| *	Revert "Merge pull request #27775 from domcleal/27774-format-reset"	Rafael Mendonça França	2017-03-21	1	-14/+5
\| *	Add support for calling nested direct routes (#28462)	Andrew White	2017-03-17	1	-8/+28
\| *	Merge pull request #28341 from mtsmfm/pass-options-to-driven-by	Rafael França	2017-03-17	1	-1/+2
\| \|\
\| \| *	Pass options to `driven_by`	Fumiaki MATSUSHIMA	2017-03-13	1	-1/+2
\| * \|	Remove unnecessary params munging	Andrew White	2017-03-15	1	-0/+61
\| \|/
\| *	Fixes ActionController::Rendering#with_defaults	alpaca-tc	2017-03-12	1	-0/+10
\| *	Use correct value in `reverse_merge` test	yuuji.yaginuma	2017-03-11	1	-8/+4
\| *	Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparameters	Rafael Mendonça França	2017-03-10	1	-0/+29
\| \|\
\| \| *	Added `reverse_merge`/`reverse_merge!` to AC::Parameters:	Edouard CHIN	2017-03-09	1	-0/+29
\| * \|	Call system test driver per-instance rather than globally	eileencodes	2017-03-09	4	-31/+23
\| * \|	Refactor system test driver/browser	eileencodes	2017-03-09	3	-16/+11
\| \|/
\| *	Tests for delegated public methods on AC::Parameters	T.J. Schuck	2017-03-07	1	-0/+63
\| *	Fix malformed asset_url when rendering template with ActionController::Renderer	Giorgos Vrettos	2017-03-06	1	-0/+14
\| *	Do not take screenshot if driver does not support screenshot	yuuji.yaginuma	2017-03-04	1	-0/+25
\| *	Commit flash changes when using a redirect route.	Andrew White	2017-02-25	1	-0/+49
\| *	Add missing gzip footer check in ActiveSupport::Gzip.decompress	Dylan Thacker-Smith	2017-02-24	1	-1/+1
\| *	Change `SystemTestCase.driven_by` to use `setup`/`teardown` hooks	Lucas Mazza	2017-02-24	1	-12/+14
\| *	Do not take screenshot when test skipped	yuuji.yaginuma	2017-02-23	1	-0/+10
\| *	Clarify use of params in `direct`	Andrew White	2017-02-22	1	-0/+14
\| *	Add more missing requires	Andrew White	2017-02-22	1	-0/+1
\| *	Split direct method into two	Andrew White	2017-02-21	1	-35/+75
\| *	Removed `model_name` method to prevent warning	Andrew White	2017-02-21	1	-0/+1
\| *	Support mapping of non-model classes	Andrew White	2017-02-21	1	-0/+23
\| *	Raise an error if `direct` is inside a scope block	Andrew White	2017-02-21	1	-0/+12
\| *	Add custom polymorphic mapping	Andrew White	2017-02-21	1	-1/+71
\| *	Add test for calling a url helper in Mapper#direct	Andrew White	2017-02-21	1	-0/+7
\| *	Only accept symbols and strings for Mapper#direct	Andrew White	2017-02-21	1	-0/+17
\| *	Rename url_helper to direct	Andrew White	2017-02-21	1	-12/+12
\| *	Add support for defining custom url helpers in routes.rb	Andrew White	2017-02-21	1	-0/+121
\| *	Merge pull request #28081 from meinac/fix_redirect_method	Guillermo Iguaran	2017-02-21	1	-2/+2
\| \|\
\| \| *	Use `response#location` instead of `#location` in redirect.	Mehmet Emin INAC	2017-02-20	1	-2/+2
\| * \|	Fix default host in setup, move teardown to helper file	eileencodes	2017-02-20	1	-1/+8
\| * \|	Fix screenshot helper to provide correct file name	eileencodes	2017-02-20	1	-1/+9
\| * \|	Move and rename system tests	eileencodes	2017-02-20	5	-0/+60
\| * \|	Turn system testing into it's own gem and rename	eileencodes	2017-02-20	5	-131/+0
\| * \|	Appease Rubocop	eileencodes	2017-02-20	4	-6/+6