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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #28369 from mylake/reduce-postgresql-adapter-memory-bloat	Rafael França	2017-03-13	1	-2/+2
\|\
\| *	Use “distinct” to filter redundant types from pg_typeto reduce memory blo...	mylake	2017-03-10	1	-2/+2
* \|	Merge pull request #28356 from jasl/patch-1	Rafael França	2017-03-13	1	-9/+1
\|\ \
\| * \|	Remove non-exists method delegation and correct doc	jasl	2017-03-11	1	-9/+1
* \| \|	Merge pull request #28068 from kamipo/refactor_data_sources	Rafael França	2017-03-13	8	-205/+156
\|\ \ \
\| * \| \|	Prefer `USING (column_list)` for joining information_schema	Ryuta Kamizono	2017-02-25	1	-3/+1
\| * \| \|	Extract `data_source_sql` to refactor data source statements	Ryuta Kamizono	2017-02-20	8	-202/+155
* \| \| \|	Move "fixes" to a new line	Jon Moss	2017-03-13	1	-1/+3
* \| \| \|	Lint activesupport/CHANGELOG.md	Jon Moss	2017-03-13	1	-8/+10
* \| \| \|	Small grammar change + new line for "fixes"	Jon Moss	2017-03-13	1	-2/+4
* \| \| \|	Small grammar change	Jon Moss	2017-03-13	1	-3/+1
* \| \| \|	Merge pull request #28404 from olimart/master	Jon Moss	2017-03-13	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix Typo [ci skip]	Olivier	2017-03-13	1	-1/+1
\|/ / / /
* \| \| \|	Fix HTTPS grammar	Jon Moss	2017-03-13	1	-4/+4
* \| \| \|	Merge pull request #28381 from shime/docs-action-controller-base	Vipul A M	2017-03-13	21	-55/+55
\|\ \ \ \
\| * \| \| \|	[docs] fix ActionController documentation	Hrvoje Šimić	2017-03-12	21	-55/+55
* \| \| \| \|	Merge pull request #28385 from javan/actioncable/fix-npm-package	Guillermo Iguaran	2017-03-13	3	-1/+38
\|\ \ \ \ \
\| * \| \| \| \|	Restore action_cable.js UMD module support. Fixes #28366	Javan Makhmali	2017-03-11	3	-1/+38
* \| \| \| \| \|	Merge pull request #28185 from renchap/system-testing-screenshot-output	Eileen M. Uchitelle	2017-03-13	1	-5/+34
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Dont always display inline screenshots in system testing (#28133)	Renaud Chaput	2017-03-11	1	-5/+34
* \| \| \| \| \| \|	Merge pull request #28017 from mtsmfm/suppress-dep-warn	Matthew Draper	2017-03-13	3	-0/+6
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Suppress deprecation warning `implementing to_yaml is deprecated`	Fumiaki MATSUSHIMA	2017-02-15	3	-0/+6
* \| \| \| \| \| \| \|	Merge pull request #28352 from alpaca-tc/fixes_renderer_with_defaults	Akira Matsuda	2017-03-13	3	-1/+17
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fixes ActionController::Rendering#with_defaults	alpaca-tc	2017-03-12	3	-1/+17
* \| \| \| \| \| \| \| \|	Merge pull request #28371 from kamipo/simplify_count	Andrew White	2017-03-12	1	-7/+4
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Simply forward `Calculations#count` to `Enumerable#count`	Ryuta Kamizono	2017-03-10	1	-7/+4
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix weird documentation line	Jon Moss	2017-03-12	1	-1/+1
* \| \| \| \| \| \| \| \|	Merge pull request #28372 from kamipo/delegate_as_json	Andrew White	2017-03-12	3	-6/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Simply delegate `as_json` to `records`	Ryuta Kamizono	2017-03-10	3	-6/+2
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Second editing pass on "Active Model Basics" guide	Jon Moss	2017-03-12	1	-16/+18
* \| \| \| \| \| \| \| \|	First editing pass on "Active Model Basics" guide	Jon Moss	2017-03-12	1	-11/+12
* \| \| \| \| \| \| \| \|	Add link to mentioned API [ci skip] (#28392)	Vipul A M	2017-03-12	1	-1/+1
* \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \