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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23138 from rails/custom-url-helpers-and-polymorphic-urls	Andrew White	2017-02-21	1	-2/+185
\|\
\| *	Split direct method into two	Andrew White	2017-02-21	1	-4/+4
\| *	Prefer remove_method over undef_method	Andrew White	2017-02-21	1	-0/+58
\| *	Add custom polymorphic mapping	Andrew White	2017-02-21	1	-4/+98
\| *	Rename url_helper to direct	Andrew White	2017-02-21	1	-4/+4
\| *	Add support for defining custom url helpers in routes.rb	Andrew White	2017-02-21	1	-2/+33
* \|	Use released arel	Rafael Mendonça França	2017-02-21	1	-1/+0
* \|	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
\|/
*	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 #26703 from eileencodes/rails_system_tests	Eileen M. Uchitelle	2017-02-20	19	-1/+134
\|\ \
\| * \|	Rename system_test_helper -> application_system_test_case	eileencodes	2017-02-20	6	-4/+4
\| * \|	Fix default host in setup, move teardown to helper file	eileencodes	2017-02-20	3	-15/+0
\| * \|	Add default configuration to generated system test helper	eileencodes	2017-02-20	3	-0/+6
\| * \|	Move and rename system tests	eileencodes	2017-02-20	8	-11/+12
\| * \|	Refactor config settings to use generated file	eileencodes	2017-02-20	11	-19/+39
\| * \|	Don't load ActionSystemTest in production	eileencodes	2017-02-20	2	-1/+12
\| * \|	Turn system testing into it's own gem and rename	eileencodes	2017-02-20	8	-8/+7
\| * \|	Appease Rubocop	eileencodes	2017-02-20	2	-2/+2
\| * \|	Add tests for system testing	eileencodes	2017-02-20	3	-1/+37
\| * \|	Add configuration option for driver adapter	eileencodes	2017-02-20	1	-0/+1
\| * \|	Add skeleton for Rails::SystemTestCase	eileencodes	2017-02-20	1	-0/+8
\| * \|	Add generators and ability to run system tests	eileencodes	2017-02-20	14	-0/+66
* \| \|	Merge pull request #27941 from y-yagi/prevent_multiple_values_being_set_to_ru...	Kasper Timm Hansen	2017-02-20	3	-7/+31
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Prevent multiple values being set to `run_via`	yuuji.yaginuma	2017-02-18	3	-7/+31
* \| \|	Merge pull request #27863 from robin850/api-improvements	Matthew Draper	2017-02-21	3	-16/+47
\|\ \ \
\| * \| \|	Properly nest core classes under a "Core Extensions" label	Robin Dupret	2017-02-20	2	-9/+33
\| * \| \|	Avoid documenting private or external classes	Robin Dupret	2017-02-07	2	-7/+14
* \| \| \|	Merge pull request #28059 from y-yagi/do_not_run_git_init_inside_test_dummy	Guillermo Iguaran	2017-02-20	2	-1/+2
\|\ \ \ \
\| * \| \| \|	Do not run `git init` in dummy application	yuuji.yaginuma	2017-02-18	2	-1/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #28013 from iguchi1124/fix-missing-namespace-wrapper	Godfrey Chan	2017-02-19	2	-2/+8
\|\ \ \ \
\| * \| \| \|	Add test for generate namespaced integration test	Shota Iguchi	2017-02-16	1	-2/+6
\| * \| \| \|	Add missing module namespacing wrapper	Shota Iguchi	2017-02-15	1	-0/+2
\| \|/ / /
* / / /	Share the common implementation between apps and engines.	Kasper Timm Hansen	2017-02-18	1	-12/+7
\|/ / /
* \| \|	Merge pull request #27605 from mtsmfm/fix-generator-command-for-nested-rails-...	Godfrey Chan	2017-02-14	3	-3/+27
\|\ \ \
\| * \| \|	Fix generator command for nested (namespaced) rails engine (take 2)	Fumiaki MATSUSHIMA	2017-01-07	3	-3/+27
* \| \| \|	Remove unused require	Ryuta Kamizono	2017-02-12	2	-2/+0
* \| \| \|	Add `Style/EmptyLinesAroundMethodBody` in `.rubocop.yml` and remove extra emp...	Ryuta Kamizono	2017-02-12	1	-1/+0
* \| \| \|	Fix rubocop violations	Rafael Mendonça França	2017-02-09	1	-1/+1
* \| \| \|	remove `ActiveSupport.halt_callback_chains_on_return_false` from everywhere	yuuji.yaginuma	2017-02-08	2	-4/+0
\| \|_\|/ \|/\| \|
* \| \|	Correct spelling	Benjamin Fleischer	2017-02-05	1	-2/+2
* \| \|	Merge pull request #27802 from domcleal/27801-multiple-rake-tests	Kasper Timm Hansen	2017-02-05	3	-7/+28
\|\ \ \
\| * \| \|	Collect all file patterns when running multiple rake test tasks	Dominic Cleal	2017-02-04	3	-7/+28
* \| \| \|	Merge pull request #27891 from y-yagi/ignore_yarn_error_log	Eileen M. Uchitelle	2017-02-03	2	-0/+6
\|\ \ \ \
\| * \| \| \|	Ignore yarn error log file	yuuji.yaginuma	2017-02-03	2	-0/+6
\| \|/ / /
* / / /	generate mailer layout files only when it does not exist	yuuji.yaginuma	2017-02-02	1	-1/+1
\|/ / /