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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #28103 from y-yagi/remove_needless_extension	Jon Moss	2017-02-21	1	-1/+1
\|\
\| *	remove needless extension from system test example [ci skip]	yuuji.yaginuma	2017-02-22	1	-1/+1
\|/
*	Merge pull request #28100 from fernandes/patch-1	Jon Moss	2017-02-21	1	-1/+1
\|\
\| *	[doc] Fix wrong class name in testing.md	Celso Fernandes	2017-02-21	1	-1/+1
\|/
*	Merge pull request #28095 from matthewd/nested-database-config	Matthew Draper	2017-02-22	2	-0/+69
\|\
\| *	Allow 3-level DB configs to group connections by environment	Matthew Draper	2017-02-22	2	-0/+69
* \|	Merge pull request #28042 from kamipo/add_changelog_for_27384	Rafael França	2017-02-21	2	-4/+8
\|\ \
\| * \|	Add CHANGELOG entry for #27384 and #27762	Ryuta Kamizono	2017-02-17	2	-4/+8
* \| \|	[ci skip] Fix direct/resolve documentation.	Kasper Timm Hansen	2017-02-21	1	-11/+11
* \| \|	[ci skip] Fix typos in direct/resolve changelog.	Kasper Timm Hansen	2017-02-21	1	-2/+2
* \| \|	Merge pull request #23138 from rails/custom-url-helpers-and-polymorphic-urls	Andrew White	2017-02-21	8	-16/+787
\|\ \ \
\| * \| \|	Fix schema leakage from dirty_test.rb	Andrew White	2017-02-21	1	-0/+1
\| * \| \|	Split direct method into two	Andrew White	2017-02-21	5	-113/+159
\| * \| \|	Push option extract into call method	Andrew White	2017-02-21	2	-8/+7
\| * \| \|	Fix typo in exception message	Andrew White	2017-02-21	1	-1/+1
\| * \| \|	Removed `model_name` method to prevent warning	Andrew White	2017-02-21	1	-0/+1
\| * \| \|	Prefer remove_method over undef_method	Andrew White	2017-02-21	3	-4/+69
\| * \| \|	Support mapping of non-model classes	Andrew White	2017-02-21	2	-3/+33
\| * \| \|	Raise an error if `direct` is inside a scope block	Andrew White	2017-02-21	2	-3/+26
\| * \| \|	Add CHANGELOG entry for `direct` method	Andrew White	2017-02-21	1	-0/+39
\| * \| \|	Add custom polymorphic mapping	Andrew White	2017-02-21	6	-65/+314
\| * \| \|	Add test for calling a url helper in Mapper#direct	Andrew White	2017-02-21	1	-0/+7
\| * \| \|	Don't allocate a hash unnecessarily	Andrew White	2017-02-21	2	-2/+6
\| * \| \|	Only accept symbols and strings for Mapper#direct	Andrew White	2017-02-21	2	-1/+23
\| * \| \|	Rename url_helper to direct	Andrew White	2017-02-21	3	-23/+23
\| * \| \|	Add support for defining custom url helpers in routes.rb	Andrew White	2017-02-21	4	-2/+270
\| * \| \|	Wrap routes.url_helpers.url_for via a proxy	Andrew White	2017-02-21	1	-4/+21
* \| \| \|	Add backticks around method names	Jon Moss	2017-02-21	1	-1/+1
* \| \| \|	Remove extra spaces	Jon Moss	2017-02-21	1	-1/+1
* \| \| \|	Add backticks around command	Jon Moss	2017-02-21	1	-1/+1
* \| \| \|	Use released arel	Rafael Mendonça França	2017-02-21	8	-16/+2
* \| \| \|	Add backticks around constant	Jon Moss	2017-02-21	1	-1/+1
* \| \| \|	Revert back to the original of using package.json in the root of the project ...	David Heinemeier Hansson	2017-02-21	7	-13/+13
* \| \| \|	Only load SystemTestCase if Capybara is defined	eileencodes	2017-02-21	1	-5/+10
\|/ / /
* \| /	Tiny documentation edits [ci skip]	Robin Dupret	2017-02-21	2	-17/+12
\| \|/ \|/\|
* \|	Merge pull request #28092 from sikachu/fix-define_attribute_method-with-symbo...	Guillermo Iguaran	2017-02-21	2	-1/+8
\|\ \
\| * \|	Fix `define_attribute_method` with Symbol in AR	Prem Sichanugrist	2017-02-21	2	-1/+8
* \| \|	Merge pull request #28088 from y-yagi/do_not_generate_templates_to_api_doc	Guillermo Iguaran	2017-02-21	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Do not display template files on API doc [ci skip]	yuuji.yaginuma	2017-02-21	1	-1/+1
* \| \|	Fix run_via[]= backwards compatibility.	Kasper Timm Hansen	2017-02-21	2	-1/+13
* \| \|	Merge pull request #28055 from robertomiranda/patch-3	Guillermo Iguaran	2017-02-21	2	-2/+2
\|\ \ \
\| * \| \|	Use Puma 3.7.x	Roberto Miranda	2017-02-20	2	-2/+2
* \| \| \|	Merge pull request #28089 from kenta-s/improve-testing-docs	Vipul A M	2017-02-21	2	-4/+4
\|\ \ \ \
\| * \| \| \|	Fix some grammar in docs [ci skip]	kenta-s	2017-02-21	2	-4/+4
\|/ / / /
* \| \| \|	Merge pull request #28081 from meinac/fix_redirect_method	Guillermo Iguaran	2017-02-21	2	-3/+3
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Use `response#location` instead of `#location` in redirect.	Mehmet Emin INAC	2017-02-20	2	-3/+3
* \| \| \|	Merge pull request #28083 from eileencodes/ensure-test-threads-shared-db-conn	Matthew Draper	2017-02-21	8	-32/+80
\|\ \ \ \
\| * \| \| \|	Ensure test threads share a DB connection	eileencodes	2017-02-20	8	-32/+80
* \| \| \| \|	Add missing space	Jon Moss	2017-02-20	1	-1/+1
* \| \| \| \|	Add changelog for system tests	eileencodes	2017-02-20	1	-0/+8