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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove unused `@txn` variable	Eugene Kenny	2017-03-15	2	-2/+0
\| \| \| \| \| \|	This was added in c24c885209ac2334dc6f798c394a821ee270bec6, removed in b89ffe7f0047eb614e42232a21201b317b880755, and then (unintentionally?) reintroduced in 2d7ae1b08ee2a10b12cbfeef3a6cc6da55b57df6.
*	Don't cast to float unnecessarily	Andrew White	2017-03-15	1	-2/+2
\| \| \| \|	Adding durations to `Time` instances is perfectly okay.
*	Merge pull request #28420 from claudiob/changelog-skip-coffee	Claudio B	2017-03-14	1	-0/+4
\|\ \| \| \| \|	Add CHANGELOG entry for --skip-coffee [ci skip]
\| *	Add CHANGELOG entry for --skip-coffee [ci skip]	claudiob	2017-03-14	1	-0/+4
\|/ \| \| \|	Was added in #25248 by @bluesh55
*	Merge pull request #28410 from fphilipe/remove-obsolete-warning-in-guides	Ryuta Kamizono	2017-03-14	1	-3/+0
\|\ \| \| \| \|	Remove obsolete warning about regular expression
\| *	Remove obsolete warning about regular expression	Philipe Fatio	2017-03-14	1	-3/+0
\|/ \| \| \| \| \| \| \| \| \|	This warning became obsolete when the regular expression was changed to use `\z` instead of `\Z` in fce9c4e5e1ecb31cff2ca43a04fbe332816c3c45. "-1234\n" =~ /\A[+-]?\d+\Z/ => 0 "-1234\n" =~ /\A[+-]?\d+\z/ => nil [ci skip]
*	Revert "Merge pull request #28369 from ↵	Matthew Draper	2017-03-14	1	-2/+2
\| \| \| \| \| \| \| \| \|	mylake/reduce-postgresql-adapter-memory-bloat" This reverts commit 192db64452d148c7b51713979459e38407380dc6, reversing changes made to 9893955363cf6358556ed3b36f4538d5b54e9d17. We can't sacrifice correctness for performance.
*	Merge pull request #28407 from claudiob/changelog-skip-pipeline	Richard Schneeman	2017-03-13	1	-0/+17
\|\ \| \| \| \|	Add CHANGELOG for #26226 [ci skip]
\| *	Add CHANGELOG for #26226 [ci skip]	claudiob	2017-03-13	1	-0/+17
\| \|
* \|	Merge pull request #28369 from mylake/reduce-postgresql-adapter-memory-bloat	Rafael França	2017-03-13	1	-2/+2
\|\ \ \| \| \| \| \| \|	500x memory reduction of 10k schemas for postgresql adapter
\| * \|	Use “distinct” to filter redundant types from pg_typeto reduce memory ↵	mylake	2017-03-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	bloat especially in multi-schema structure database
* \| \|	Merge pull request #28356 from jasl/patch-1	Rafael França	2017-03-13	1	-9/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Remove non-exists method delegation
\| * \| \|	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
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Extract `data_source_sql` to refactor data source statements
\| * \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Lint activesupport/CHANGELOG.md	Jon Moss	2017-03-13	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Small grammar change + new line for "fixes"	Jon Moss	2017-03-13	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Small grammar change	Jon Moss	2017-03-13	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reads easier, and removes extra tick marks. [ci skip]
* \| \| \| \|	Merge pull request #28404 from olimart/master	Jon Moss	2017-03-13	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Typo [ci skip]
\| * \| \| \| \|	Fix Typo [ci skip]	Olivier	2017-03-13	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \|	Arcticle --> Article
* \| \| \| \|	Fix HTTPS grammar	Jon Moss	2017-03-13	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge pull request #28381 from shime/docs-action-controller-base	Vipul A M	2017-03-13	21	-55/+55
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	[docs] fix ActionController docs
\| * \| \| \| \|	[docs] fix ActionController documentation	Hrvoje Šimić	2017-03-12	21	-55/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	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
\| * \| \| \| \| \|	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)
\| * \| \| \| \| \| \|	Dont always display inline screenshots in system testing (#28133)	Renaud Chaput	2017-03-11	1	-5/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	3 output types are supported: - simple: only display the screenshot path - artifact: display the screenshot in the terminal, using the artifact protocol (supported by some CI) - inline (default): display the screenshot in the terminal, inline (supported by some terminals) You can force the output type by setting the `RAILS_SYSTEM_TESTING_SCREENSHOT` environment variable
* \| \| \| \| \| \| \|	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`
\| * \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Fixes ActionController::Rendering#with_defaults	alpaca-tc	2017-03-12	3	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`env` is undefined.
* \| \| \| \| \| \| \| \|	Merge pull request #28371 from kamipo/simplify_count	Andrew White	2017-03-12	1	-7/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simply forward `Calculations#count` to `Enumerable#count`
\| * \| \| \| \| \| \| \| \|	Simply forward `Calculations#count` to `Enumerable#count`	Ryuta Kamizono	2017-03-10	1	-7/+4
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow up of #24203. Since b644964b `ActiveRecord::Relation` includes `Enumerable` so it is enough to call `super` simply.
* \| \| \| \| \| \| \| \|	Fix weird documentation line	Jon Moss	2017-03-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge pull request #28372 from kamipo/delegate_as_json	Andrew White	2017-03-12	3	-6/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simply delegate `as_json` to `records`
\| * \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lots of grammar, etc fixes. [ci skip]
* \| \| \| \| \| \| \| \|	First editing pass on "Active Model Basics" guide	Jon Moss	2017-03-12	1	-11/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lots of grammar, etc fixes. [ci skip]
* \| \| \| \| \| \| \| \|	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 [ci skip]
\| * \| \| \| \| \| \| \|	Add link to API documentation	Kirill Zhuravlov	2016-11-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a link to http://api.rubyonrails.org/classes/ActionController.html in the beginning of an article.
* \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	Fix typo in the security guide	bogdanvlviv	2017-03-12	1	-2/+2
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	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]
\| * \| \| \| \| \| \| \|	Add missing documentation for MemoryStore#clear [ci skip]	Devon Estes	2016-11-15	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were missing some form of documentation for this method, so I've gone ahead and added some!
* \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Use correct value in `reverse_merge` test	yuuji.yaginuma	2017-03-11	1	-8/+4
\| \| \| \| \| \| \| \| \|