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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23080 from prathamesh-sonpatki/fix-cache-key-for-loaded-e...	Matthew Draper	2016-01-22	2	-1/+11
\|\
\| *	Fix ActiveRecord::Relation#cache_key for loaded empty collection	Prathamesh Sonpatki	2016-01-16	2	-1/+11
* \|	Merge pull request #23167 from maclover7/fix-21032	Rafael França	2016-01-21	3	-1/+15
\|\ \
\| * \|	Fix `ActionController::Parameters#==` bug	Jon Moss	2016-01-21	3	-1/+15
* \| \|	Merge pull request #23078 from y-yagi/add_application_mailer_rb_to_mountable_...	Rafael França	2016-01-21	4	-1/+12
\|\ \ \
\| * \| \|	allow symbol to end of string in `wrap_in_modules`	yuuji.yaginuma	2016-01-16	2	-5/+5
\| * \| \|	add application_mailer.rb to template of mountable engine	yuuji.yaginuma	2016-01-15	3	-0/+11
* \| \| \|	Merge pull request #23165 from shakib609/fix-23157	Jon Moss	2016-01-21	1	-0/+5
\|\ \ \ \
\| * \| \| \|	[ci skip] fix #23157	Shakib Hossain	2016-01-22	1	-0/+5
* \| \| \| \|	Use bind parameters for ranges in where clauses	Sean Griffin	2016-01-21	2	-2/+36
* \| \| \| \|	Merge pull request #23164 from vipulnsward/warning-from-renderers-test	Kasper Timm Hansen	2016-01-21	1	-1/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	- Fix warning introduced in https://github.com/vipulnsward/rails/commit/77acc...	Vipul A M	2016-01-22	1	-1/+3
\|/ / / /
* \| \| \|	Merge pull request #23156 from plentz/patch-1	Guillermo Iguaran	2016-01-21	1	-1/+1
\|\ \ \ \
\| * \| \| \|	updating secrets.yml template to use rails command instead of rake	Diego Plentz	2016-01-21	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #23154 from sealocal/improve-docs-for-respond-to	प्रथमेश Sonpatki	2016-01-21	1	-4/+9
\|\ \ \ \
\| * \| \| \|	remove doc reference to ActionController::MimeResponds#respond_to	sealocal	2016-01-20	1	-3/+0
\| * \| \| \|	document simple example of ActionController::MimeResponds#respond_to	sealocal	2016-01-20	1	-1/+9
\|/ / / /
* \| \| \|	Merge pull request #23149 from maclover7/fix-23142	Santiago Pastorino	2016-01-21	4	-1/+39
\|\ \ \ \
\| * \| \| \|	Re-add ActionController::ApiRendering	Jon Moss	2016-01-20	4	-1/+39
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #23150 from alxndr/guides-tweak	Jon Moss	2016-01-20	1	-3/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	insert newlines into code samples	Alexander	2016-01-20	1	-3/+5
\|/ / /
* \| \|	Merge pull request #23140 from rails/fix-search-for-custom-routes	Aaron Patterson	2016-01-20	2	-14/+83
\|\ \ \
\| * \| \|	Fix marking of custom routes for Journey	Andrew White	2016-01-20	2	-14/+83
* \| \| \|	Merge pull request #17573 from zerothabhishek/master	Godfrey Chan	2016-01-20	5	-10/+18
\|\ \ \ \
\| * \| \| \|	Response etags to always be weak: Prefixed W/ to value returned by ActionDisp...	abhishek	2016-01-20	5	-10/+18
* \| \| \| \|	Merge pull request #23147 from maclover7/update-rf-comment	Rafael França	2016-01-20	1	-4/+5
\|\ \ \ \ \
\| * \| \| \| \|	Small doc update per RF [ci skip]	Jon Moss	2016-01-20	1	-4/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #23135 from maclover7/add-22950-changelog	Jon Moss	2016-01-20	1	-0/+8
\|\ \ \ \ \
\| * \| \| \| \|	Add CHANGELOG.md entry for #22950	Jon Moss	2016-01-20	1	-0/+8
* \| \| \| \| \|	Merge pull request #23139 from gsamokovarov/after-create-update-destroy-commi...	Rafael França	2016-01-20	1	-3/+3
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix the API documentation layout of after_*_commit	Genadi Samokovarov	2016-01-20	1	-3/+3
\|/ / / / /
* / / / /	Revert "Remove literal? check to fix issue with prefixed optionals"	eileencodes	2016-01-20	2	-13/+1
\|/ / / /
* \| \| \|	Merge pull request #23130 from vipulnsward/html_safe_to_raw	Rafael França	2016-01-20	12	-43/+43
\|\ \ \ \
\| * \| \| \|	html_safe is not supposed to be public API for AV. This change removes usage ...	Vipul A M	2016-01-20	12	-43/+43
* \| \| \| \|	Merge pull request #23129 from Amit-Thawait/master	प्रथमेश Sonpatki	2016-01-20	1	-4/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Pluralize counter_cache column name in example [ci skip]	Amit Thawait	2016-01-20	1	-4/+4
\|/ / / /
* \| \| \|	Merge pull request #22950 from maclover7/adapterize-storage-actioncable	Matthew Draper	2016-01-20	28	-74/+347
\|\ \ \ \
\| * \| \| \|	Fix code review comments	Jon Moss	2016-01-18	15	-55/+53
\| * \| \| \|	Add em-hiredis and redis as default Gems for new applications	Jon Moss	2016-01-18	2	-0/+20
\| * \| \| \|	Small PostgreSQL adapter refactors / cleanup	Jon Moss	2016-01-18	2	-15/+16
\| * \| \| \|	ActionCable::StorageAdapter ==> ActionCable::SubscriptionAdapter	Jon Moss	2016-01-18	11	-21/+23
\| * \| \| \|	All Redis deps are now optional, Postgres --> PostgreSQL adapter	Jon Moss	2016-01-18	7	-15/+17
\| * \| \| \|	config_opts => cable, per @kaspth	Jon Moss	2016-01-18	3	-6/+7
\| * \| \| \|	Listener no longer needs to be a singleton	Matthew Draper	2016-01-18	1	-52/+58
\| * \| \| \|	Tests passing and small refactoring	Jon Moss	2016-01-18	7	-37/+65
\| * \| \| \|	Blanket unsubscribe doesn't appear to be used	Matthew Draper	2016-01-18	1	-6/+2
\| * \| \| \|	Don't execute callbacks on our main listener thread	Matthew Draper	2016-01-18	1	-1/+1
\| * \| \| \|	Pull the action methods directly onto the adapter	Matthew Draper	2016-01-18	8	-56/+51
\| * \| \| \|	Add Postgres adapter	Jon Moss	2016-01-18	3	-0/+111
\| * \| \| \|	Refactor storage_adapter	Jon Moss	2016-01-18	1	-11/+3