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

	Commit message (Expand)	Author	Age	Files	Lines
*	Updates to MessageEncryptor AEAD tests	Michael Coyne	2017-05-15	1	-10/+14
*	Fix for AEAD auth_tag check in MessageEncryptor	Michael Coyne	2017-05-15	2	-1/+9
*	Merge pull request #28125 from y-yagi/do_not_take_screenshots_when_test_skipped	Eileen M. Uchitelle	2017-02-23	2	-2/+16
\|\
\| *	Do not take screenshot when test skipped	yuuji.yaginuma	2017-02-23	2	-2/+16
* \|	Revert "Add encrypted secrets" (#28127)	David Heinemeier Hansson	2017-02-23	17	-482/+27
* \|	Add encrypted secrets (#28038)	Kasper Timm Hansen	2017-02-23	17	-27/+482
\|/
*	[ci skip] Fix more quotes in direct/resolve docs	Andrew White	2017-02-23	1	-3/+3
*	Merge pull request #23553 from kamipo/correctly_dump_native_timestamp_types_f...	Rafael França	2017-02-22	10	-5/+80
\|\
\| *	Correctly dump native timestamp types for MySQL	Ryuta Kamizono	2017-02-23	10	-5/+80
\|/
*	Merge pull request #28114 from matthewd/deprecated-evented-redis	Matthew Draper	2017-02-23	2	-1/+9
\|\
\| *	Deprecate the EventedRedis subscription adapter	Matthew Draper	2017-02-23	2	-1/+9
\|/
*	Clarify use of params in `direct`	Andrew White	2017-02-22	2	-0/+23
*	Merge pull request #28098 from rails/rails-ujs-intergration	Rafael França	2017-02-22	13	-70/+407
\|\
\| *	Test rails-ujs in our travis matrix	Rafael Mendonça França	2017-02-22	11	-70/+338
\| *	Move rails-ujs README and LICENCE to actionview	Rafael Mendonça França	2017-02-22	2	-0/+69
\|/
*	Merge pull request #27572 from matthewd/prerelease-specifier	Matthew Draper	2017-02-23	2	-10/+9
\|\
\| *	Simplify the version specifier generated by prereleases	Matthew Draper	2017-01-05	2	-10/+9
* \|	Add more missing requires	Andrew White	2017-02-22	2	-0/+2
* \|	Bump removal of `/:controller/:action` to Rails 5.2	Andrew White	2017-02-22	1	-2/+2
* \|	Add missing requires	Andrew White	2017-02-22	1	-0/+4
* \|	Add CHANGELOG entry for #28104	Andrew White	2017-02-22	1	-0/+4
* \|	Merge pull request #28104 from HashNotAdam/fix/preload_instance_variables_in_...	Andrew White	2017-02-22	2	-1/+3
\|\ \
\| * \|	Preload to_datetime before freezing a TimeWithZone instance	Adam Rice	2017-02-22	2	-1/+3
* \| \|	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