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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23669 from maclover7/internal-routes	Rafael França	2016-02-22	6	-10/+36
\|\
\| *	Add `internal` attribute to routes	Jon Moss	2016-02-22	6	-10/+36
* \|	Merge pull request #23668 from maclover7/cable-docs	Rafael França	2016-02-22	16	-70/+67
\|\ \
\| * \|	Full Action Cable documentation read through	Jon Moss	2016-02-17	16	-70/+67
* \| \|	Merge pull request #23600 from maclover7/actioncable-work	Rafael França	2016-02-22	8	-0/+64
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add notes for future selves	Jon Moss	2016-02-22	2	-0/+2
\| * \|	Generate ApplicationCable files if they do not already exist	Jon Moss	2016-02-22	4	-0/+38
\| * \|	Generate ApplicationRecord if it does not already exist	Jon Moss	2016-02-22	3	-0/+19
\| * \|	Generate `config/cable.yml` in `rails:update` command	Jon Moss	2016-02-22	1	-0/+5
\|/ /
* \|	Merge pull request #23816 from rails/params_parser_api	Rafael França	2016-02-22	5	-9/+47
\|\ \
\| * \|	Make sure we unregister the mime type before registering	Rafael Mendonça França	2016-02-22	1	-10/+22
\| * \|	Transform the mime object to symbol when registering the parsers	Rafael Mendonça França	2016-02-22	3	-5/+15
\| * \|	Use symbol of mime type instead of object to get correct parser	Mehmet Emin İNAÇ	2016-02-22	4	-6/+22
* \| \|	make sure `rake test` respects TESTOPTS	Aaron Patterson	2016-02-22	2	-1/+15
\|/ /
* \|	We are calling `to_s` in the method so we can call downcase now	Rafael Mendonça França	2016-02-22	1	-3/+3
* \|	Make per form token work when method is not provided	Rafael Mendonça França	2016-02-22	2	-3/+18
* \|	Do not pass more options that are needed.	Rafael Mendonça França	2016-02-22	1	-1/+1
* \|	Merge pull request #23752 from vipulnsward/23524-fix-button_to_delete	Rafael Mendonça França	2016-02-22	2	-49/+61
\|\ \
\| * \|	Refactored Request Forgery CSRF PerFormTokensController tests and DRY'ed them...	Vipul A M	2016-02-22	2	-71/+39
\| * \|	Fixed passing of delete method on button_to tag, creating wrong form csrf token	Vipul A M	2016-02-21	2	-2/+46
* \| \|	Merge pull request #23521 from kamipo/fix_assert_in_delta_failure	Rafael França	2016-02-22	1	-3/+8
\|\ \ \
\| * \| \|	Fix `assert_in_delta` test failure	Ryuta Kamizono	2016-02-06	1	-3/+8
* \| \| \|	Merge pull request #22748 from Azzurrio/master	Matthew Draper	2016-02-22	2	-1/+23
\|\ \ \ \
\| * \| \| \|	Fix NoMethodError preparable for Arel::Visitors in case prepared statements i...	Azzurrio	2016-02-22	2	-1/+23
* \| \| \| \|	Merge pull request #23751 from chezou/add-test-case-order-by-field	Andrew White	2016-02-22	1	-0/+6
\|\ \ \ \ \
\| * \| \| \| \|	Add assertions order by field with empty data	Michiaki Ariga	2016-02-18	1	-0/+6
* \| \| \| \| \|	Merge pull request #23808 from gfvcastro/typographical-error	प्रथमेश Sonpatki	2016-02-22	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix typographical error	Gustavo Villa	2016-02-22	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #23769 from kamipo/remove_alias_exec_without_stmt_exec_query	Santiago Pastorino	2016-02-21	1	-2/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove `alias exec_without_stmt exec_query`	Ryuta Kamizono	2016-02-19	1	-2/+0
* \| \| \| \| \| \|	Merge pull request #23682 from ShikChen/fast_strxor	Santiago Pastorino	2016-02-21	1	-1/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Improve the performance of string xor operation	shik	2016-02-15	1	-1/+2
* \| \| \| \| \| \| \|	Merge pull request #23776 from chi6rag/master	Santiago Pastorino	2016-02-21	1	-0/+4
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Adding test to verify the last week when the year is leap	Chirag Aggarwal	2016-02-20	1	-0/+4
* \| \| \| \| \| \| \| \|	Merge pull request #23803 from kamipo/reduce_attribute_to_s	Santiago Pastorino	2016-02-21	1	-6/+5
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Reduce `attribute.to_s`	Ryuta Kamizono	2016-02-22	1	-6/+5
* \| \| \| \| \| \| \| \| \|	Merge pull request #23743 from maclover7/rm-unused-parameter	Santiago Pastorino	2016-02-21	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Remove unused parameter from method	Jon Moss	2016-02-17	1	-2/+2
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #23805 from ianfleeton/validates-length-of-virtual	Santiago Pastorino	2016-02-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Match test name to test (typo)	Ian Fleeton	2016-02-21	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #23806 from sgringwe/patch-1	Santiago Pastorino	2016-02-21	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add a note about downcasing submit tag	Scott Ringwelski	2016-02-21	1	-0/+3
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #23785 from eval/correct-types-examples	Vipul A M	2016-02-22	2	-108/+108
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Show correct return types for examples [ci skip]	Gert Goet	2016-02-20	2	-108/+108
* \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Document collection caching better.	Kasper Timm Hansen	2016-02-21	1	-2/+15
* \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Clarify collection caching went EXPLICIT.	Kasper Timm Hansen	2016-02-21	1	-4/+9
* \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Mention testing fore-runners.	Kasper Timm Hansen	2016-02-21	1	-0/+2
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #23799 from y-yagi/use_method_provided_by_minitest	Kasper Timm Hansen	2016-02-21	1	-7/+1
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	use method provided by minitest	yuuji.yaginuma	2016-02-21	1	-7/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #23801 from chashmeetsingh/patch-2	प्रथमेश Sonpatki	2016-02-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \