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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #25236 from rajatbansal93/fix-typo	Arun Agrawal	2016-06-01	1	-5/+5
\|\
\| *	fix typo	Rajat Bansal	2016-06-01	1	-5/+5
* \|	Merge pull request #25231 from prathamesh-sonpatki/collapse-new-initializers	David Heinemeier Hansson	2016-06-01	10	-155/+59
\|\ \
\| * \|	Collapse all new default initializers into a single file	Prathamesh Sonpatki	2016-05-31	10	-155/+59
* \| \|	Clean up the test request/response even after an exception	Matthew Draper	2016-06-01	2	-23/+50
* \| \|	Make Active Record emit significantly smaller YAML	Sean Griffin	2016-05-31	8	-7/+82
* \| \|	Remove unused require and unused model stub	Jon Moss	2016-05-31	2	-4/+0
* \| \|	Merge pull request #25170 from maclover7/add-configuration-cable	Jeremy Daer	2016-05-31	8	-51/+69
\|\ \ \
\| * \| \|	Add helper for testing against a mock WebSocket and server	Javan Makhmali	2016-05-31	5	-56/+48
\| * \| \|	Reorganize `MockWebSocket`	Jon Moss	2016-05-31	2	-22/+32
\| * \| \|	Add configuration for `WebSocket` and `logger`	Jon Moss	2016-05-31	4	-6/+22
* \| \| \|	Respect options passed to `foreign_key` when reverting `add_reference`	Sean Griffin	2016-05-31	2	-4/+24
* \| \| \|	Merge pull request #25216 from javan/actioncable/tune-sauce-labs-tests	Jeremy Daer	2016-05-31	3	-21/+20
\|\ \ \ \
\| * \| \| \|	Lock Faye version to avoid bug with its Promise polyfill, use mainline blade-...	Javan Makhmali	2016-05-31	2	-15/+14
\| * \| \| \|	Test single latest browser version	Javan Makhmali	2016-05-31	1	-6/+6
\| \|/ / /
* \| \| \|	Merge pull request #25213 from kamipo/do_not_include_default_column_limit	Sean Griffin	2016-05-31	3	-10/+15
\|\ \ \ \
\| * \| \| \|	Do not include default column limit in schema.rb	Ryuta Kamizono	2016-05-31	3	-10/+15
\| \|/ / /
* \| \| \|	`ActiveRecord::Base#hash` should differ between classes	Sean Griffin	2016-05-31	2	-1/+5
* \| \| \|	More Action Pack `abstract_unit` cleanup (#25211)	Jon Moss	2016-05-31	4	-28/+23
* \| \| \|	Merge pull request #25207 from rajatbansal93/fix-typos	Jon Moss	2016-05-31	4	-6/+6
\|\ \ \ \
\| * \| \| \|	fix grammar	Rajat Bansal	2016-05-31	4	-6/+6
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Ensure hashes can be passed to attributes using `composed_of`	Sean Griffin	2016-05-31	4	-5/+21
\| \|/ / \|/\| \|
* \| \|	Bump jbuilder dependency to version 2.5.0 for compatibility fixes	David Heinemeier Hansson	2016-05-31	1	-1/+1
\|/ /
* \|	Merge pull request #25206 from maclover7/jm-ap-tests	Rafael França	2016-05-31	2	-18/+18
\|\ \
\| * \|	Move `Workshop` class definition	Jon Moss	2016-05-30	2	-18/+18
\|/ /
* \|	Merge pull request #25179 from kamipo/reuse_result_of_associated_table	Sean Griffin	2016-05-30	1	-2/+3
\|\ \
\| * \|	Reuse a result of `table.associated_table(column)` in `AssociationQueryHandle...	Ryuta Kamizono	2016-05-28	1	-2/+3
* \| \|	Exists shouldn't error when used with `includes`	Sean Griffin	2016-05-30	4	-11/+9
* \| \|	Merge pull request #25194 from vipulnsward/use-cipher	Kasper Timm Hansen	2016-05-30	1	-1/+1
\|\ \ \
\| * \| \|	use OpenSSL::Cipher instead of deprecated OpenSSL::Cipher::Cipher for cipher ...	Vipul A M	2016-05-29	1	-1/+1
* \| \| \|	Ensure that instances of `ActiveModel::Errors` can be marshalled	Sean Griffin	2016-05-30	2	-2/+32
* \| \| \|	Merge pull request #25175 from kamipo/fix_migration_class_names_in_tests	Kasper Timm Hansen	2016-05-30	6	-6/+6
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix migration class names in tests	Ryuta Kamizono	2016-05-28	6	-6/+6
* \| \| \|	Tiny document fixes [ci skip]	Robin Dupret	2016-05-30	2	-2/+2
\| \|/ / \|/\| \|
* \| \|	Merge pull request #22240 from resource11/resource11-patch-1	Arthur Nogueira Neves	2016-05-29	1	-4/+4
\|\ \ \
\| * \| \|	Issue 22240: adds link to list of instance methods [ci skip]	Kathleen McMahon	2016-03-18	1	-4/+4
* \| \| \|	Merge pull request #24965 from arthurnn/arthurnn/conn_api	Arthur Nogueira Neves	2016-05-29	7	-37/+43
\|\ \ \ \
\| * \| \| \|	Add to_hash to specification	Arthur Neves	2016-05-25	4	-4/+7
\| * \| \| \|	Remove `name` from `establish_connection`	Arthur Neves	2016-05-24	7	-33/+32
\| * \| \| \|	Move establish_connection to handler	Arthur Neves	2016-05-24	3	-14/+18
* \| \| \| \|	Merge pull request #25184 from prathamesh-sonpatki/move-up-framework-initiali...	David Heinemeier Hansson	2016-05-29	11	-35/+37
\|\ \ \ \ \
\| * \| \| \| \|	Move new default initializers into separate directory	Prathamesh Sonpatki	2016-05-28	11	-35/+37
* \| \| \| \| \|	Merge pull request #25190 from willnet/fix-action-cable-guides	प्रथमेश Sonpatki	2016-05-29	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[ci skip]Fix wrong require path raising LoadError	willnet	2016-05-29	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #25189 from xtian/patch-1	प्रथमेश Sonpatki	2016-05-29	1	-5/+5
\|\ \ \ \ \ \
\| * \| \| \| \| \|	ActionController::Parameters: Fix #dig doc code	Christian Wesselhoeft	2016-05-29	1	-5/+5
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #25188 from y-yagi/rename_enum_prefix_suffix	Kasper Timm Hansen	2016-05-29	1	-2/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	rename enum_prefix and enum_suffix options to _prefix and _suffix [ci skip]	yuuji.yaginuma	2016-05-29	1	-2/+3
\|/ / / / /
* \| \| \| \|	Fix more assertion counts.	Kasper Timm Hansen	2016-05-28	1	-2/+2
* \| \| \| \|	Fix assertion count after 69e1bb52.	Kasper Timm Hansen	2016-05-28	1	-2/+2