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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \|	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
\| * \| \| \| \| \|	Adapterize ActionCable storage and extract behavior	Jon Moss	2016-01-18	17	-50/+173
* \| \| \| \| \| \|	Merge pull request #23111 from prathamesh-sonpatki/fix-changelog	Rafael França	2016-01-20	1	-1/+5
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Update CHANEGLOG for https://github.com/rails/rails/pull/20005 [ci skip]	Prathamesh Sonpatki	2016-01-20	1	-1/+5
\|/ / / / / /
* \| \| \| \| \|	Revert "Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipp...	schneems	2016-01-19	2	-2/+2
* \| \| \| \| \|	Add `ModelSchema::type_for_attribute` to the public API	Sean Griffin	2016-01-19	1	-1/+12
* \| \| \| \| \|	Merge pull request #23120 from vipulnsward/always-set-vary-for-static-assets	Richard Schneeman	2016-01-19	2	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipped versi...	Vipul A M	2016-01-19	2	-2/+2
* \| \| \| \| \| \|	Merge pull request #23125 from Gaurav2728/update_puma_as_webserver	Rafael França	2016-01-19	4	-17/+14
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] update guide for Puma web server instead of Webrick	Gaurav Sharma	2016-01-20	4	-17/+14
* \| \| \| \| \| \| \|	Merge pull request #23124 from vipulnsward/rake-rails	Yves Senn	2016-01-19	3	-5/+5
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	- Changed from bin/rake to bin/rails at more application places.	Vipul A M	2016-01-20	3	-5/+5
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #23123 from schneems/schneems/strong_params_method_missing	Richard Schneeman	2016-01-19	2	-1/+32
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Link to docs instead of listing methods	schneems	2016-01-19	1	-5/+7
\| * \| \| \| \| \| \|	Add methods to StrongParameters	schneems	2016-01-19	2	-2/+9
\| * \| \| \| \| \| \|	[close #23084] Deprecated StrongParameters	schneems	2016-01-19	2	-0/+22
* \| \| \| \| \| \| \|	Merge pull request #23119 from Gaurav2728/update_guide_to_bin_rails_command	Jon Moss	2016-01-19	6	-37/+37
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	use bin/rails default instead of rake commands [ci skip]	Gaurav Sharma	2016-01-19	6	-37/+37
\|/ / / / / / /