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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #27152 from tjai89/patch-5	Vipul A M	2017-03-12	1	-1/+1
\|\
\| *	Add link to API documentation	Kirill Zhuravlov	2016-11-23	1	-1/+1
* \|	Merge pull request #28390 from bogdanvlviv/fix-typo-in-security-guide	Vipul A M	2017-03-12	1	-2/+2
\|\ \
\| * \|	Fix typo in the security guide	bogdanvlviv	2017-03-12	1	-2/+2
\|/ /
* \|	AS:Cache:MemoryStore doc fixes [ci skip] (#28389)	Vipul A M	2017-03-12	1	-1/+1
* \|	Merge pull request #27051 from devonestes/adding-cache-clear-docs	Vipul A M	2017-03-12	1	-0/+2
\|\ \
\| * \|	Add missing documentation for MemoryStore#clear [ci skip]	Devon Estes	2016-11-15	1	-0/+2
* \| \|	Merge pull request #28378 from y-yagi/use_correct_variable_in_reverse_merge_test	Eileen M. Uchitelle	2017-03-11	1	-8/+4
\|\ \ \
\| * \| \|	Use correct value in `reverse_merge` test	yuuji.yaginuma	2017-03-11	1	-8/+4
* \| \| \|	Merge pull request #28380 from shime/docs-actionpack-api	Andrew White	2017-03-11	1	-4/+3
\|\ \ \ \
\| * \| \| \|	[docs] remove unnecessary sentence	Hrvoje Šimić	2017-03-11	1	-4/+3
\|/ / / /
* / / /	Fix indentation and formatting in CHANGELOGs [ci skip]	Ryuta Kamizono	2017-03-11	2	-19/+19
\|/ / /
* \| \|	Add @takkanm credits in the changelog [ci skip]	Rafael Mendonça França	2017-03-10	1	-1/+1
* \| \|	Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparameters	Rafael Mendonça França	2017-03-10	3	-0/+48
\|\ \ \
\| * \| \|	Added `reverse_merge`/`reverse_merge!` to AC::Parameters:	Edouard CHIN	2017-03-09	3	-0/+48
* \| \| \|	Merge pull request #28373 from godfat/fix-cache-middleware-with-throw	Rafael França	2017-03-10	2	-4/+15
\|\ \ \ \
\| * \| \| \|	Make sure local cache cleared even it's throwing:	Lin Jen-Shin	2017-03-10	2	-4/+15
* \| \| \| \|	Merge pull request #28370 from kamipo/remove_conditions_params_from_delete_all	Rafael França	2017-03-10	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Remove conditions parameter from `NullRelation#delete_all`	Ryuta Kamizono	2017-03-10	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #28375 from baerjam/improve-testing-documentaion	Vipul A M	2017-03-11	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Improve readability of testing guide [ci skip]	James Baer	2017-03-10	1	-1/+1
\|/ / / /
* \| \| \|	Add missing credit [ci skip]	Ryuta Kamizono	2017-03-10	1	-0/+2
* \| \| \|	Merge pull request #28182 from y-yagi/show_correct_rails_commands	Kasper Timm Hansen	2017-03-09	8	-18/+47
\|\ \ \ \
\| * \| \| \|	Show correct commands in help	yuuji.yaginuma	2017-03-03	8	-18/+47
* \| \| \| \|	[ci skip] Document read_encrypted_secrets config.	Kasper Timm Hansen	2017-03-09	1	-0/+8
* \| \| \| \|	Merge pull request #28351 from kamipo/deprecate_schema_migrations_table_name	Rafael Mendonça França	2017-03-09	3	-0/+13
\|\ \ \ \ \
\| * \| \| \| \|	Deprecate `Migrator.schema_migrations_table_name`	Ryuta Kamizono	2017-03-09	3	-0/+13
* \| \| \| \| \|	Merge pull request #28354 from kamipo/fix_select_with_block_and_dirty_target	Eileen M. Uchitelle	2017-03-09	3	-2/+14
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix select with block doesn't return newly built records in has_many association	Ryuta Kamizono	2017-03-09	3	-2/+14
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'refactor-system-test-driver'	eileencodes	2017-03-09	9	-91/+64
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Call system test driver per-instance rather than globally	eileencodes	2017-03-09	7	-42/+36
\| * \| \| \| \| \|	Refactor system test driver/browser	eileencodes	2017-03-09	6	-56/+35
\|/ / / / / /
* / / / / /	force UTF-8 as external encoding in guides generation [ci skip]	Xavier Noria	2017-03-09	1	-3/+16
\|/ / / / /
* \| \| \| \|	Merge pull request #28340 from k3rni/document-am-default-url-options	Jon Moss	2017-03-08	1	-0/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Document using `default_url_options` in an ActionMailer class.	Krzysztof Zych	2017-03-08	1	-0/+3
* \| \| \| \|	Merge pull request #28336 from tjschuck/test_delegated_params_methods	Rafael França	2017-03-08	1	-0/+63
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Tests for delegated public methods on AC::Parameters	T.J. Schuck	2017-03-07	1	-0/+63
* \| \| \| \|	Merge pull request #28338 from y-yagi/use_appropriate_type_in_generators_test	Kasper Timm Hansen	2017-03-08	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Use appropriate type in generators test	yuuji.yaginuma	2017-03-08	1	-1/+1
* \| \| \| \|	params --> parameters	Jon Moss	2017-03-07	1	-2/+2
* \| \| \| \|	Merge pull request #28334 from tjschuck/document_delegated_params_methods	Jon Moss	2017-03-07	1	-0/+71
\|\ \ \ \ \
\| * \| \| \| \|	Document delegated public methods on AC::Parameters	T.J. Schuck	2017-03-07	1	-0/+71
\|/ / / / /
* \| \| \| \|	Merge pull request #28289 from maicher/master	Vipul A M	2017-03-07	1	-2/+18
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Improve foreign key description in guides [ci skip]	Krzysztof Maicher	2017-03-06	1	-2/+18
* \| \| \| \|	Check whether `Rails.application` defined before calling it	Andrew White	2017-03-07	2	-1/+11
* \| \| \| \|	Merge pull request #28326 from y-yagi/remove_on_option_that_does_not_exist	Vipul A M	2017-03-07	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Remove `:on` option that does ot exist [ci skip]	yuuji.yaginuma	2017-03-07	1	-2/+2
* \| \| \| \| \|	CI against jruby-9.1.8.0	Akira Matsuda	2017-03-07	1	-3/+3
* \| \| \| \| \|	Merge pull request #28320 from y-yagi/fix_typo_titleize	Jon Moss	2017-03-06	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix typo `titlelize` -> `titleize` [ci skip]	yuuji.yaginuma	2017-03-07	1	-2/+2
\|/ / / / /