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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fixed `where` for polymorphic associations when passed an array containing di...	Philippe Huibonhoa	2016-02-16	7	-6/+111
*	Merge pull request #23630 from akshaymohite/correct-test-name-api-only	Yves Senn	2016-02-16	1	-1/+1
\|\
\| *	Correct config option from only_api to api_only in test	Akshay	2016-02-12	1	-1/+1
* \|	fix class name typo.	Yves Senn	2016-02-16	2	-3/+3
* \|	Merge pull request #23614 from georgemillo/foreign_key	Yves Senn	2016-02-16	3	-2/+23
\|\ \
\| * \|	Let t.foreign_key use the same `to_table` twice	George Millo	2016-02-15	3	-2/+27
* \| \|	reset `ActionMailer::Base.deliveries` in `ActionDispatch::IntegrationTest`.	Yves Senn	2016-02-16	5	-4/+73
* \| \|	Merge pull request #23692 from abhishekjain16/docs	Yves Senn	2016-02-16	3	-3/+3
\|\ \ \
\| * \| \|	Use a URL instead of an URL everywhere	Abhishek Jain	2016-02-15	3	-3/+3
* \| \| \|	Merge pull request #23706 from vipulnsward/add-changelog-for-regression	Yves Senn	2016-02-16	1	-2/+9
\|\ \ \ \
\| * \| \| \|	Add missing CHANGELOG for regression fix in #18155 which fixes #13387	Vipul A M	2016-02-16	1	-0/+7
* \| \| \| \|	Remove unused test controller action	Andrew White	2016-02-16	1	-5/+0
* \| \| \| \|	Merge pull request #22828 from ma2gedev/should-escape-cookie	Andrew White	2016-02-16	2	-1/+21
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Join values using '; ' as per RFC spec	Andrew White	2016-02-16	1	-1/+1
\| * \| \| \|	Add require and move escape to private method	Andrew White	2016-02-16	1	-1/+6
\| * \| \| \|	Move test for #22828 into it's own test	Andrew White	2016-02-16	1	-2/+10
\| * \| \| \|	Merge branch 'should-escape-cookie' of https://github.com/ma2gedev/rails into...	Andrew White	2016-02-16	2	-1/+8
\|/\| \| \| \|
\| * \| \| \|	Escape cookie's key and value in ActionController::TestCase	Takayuki Matsubara	2015-12-30	2	-1/+8
* \| \| \| \|	fix more failing tests due to 07e422f ... :pray:	Yves Senn	2016-02-15	1	-2/+2
* \| \| \| \|	fixing the build take II. :sweat:	Yves Senn	2016-02-15	1	-1/+1
* \| \| \| \|	fix build broken by 07e422f58d61da0.	Yves Senn	2016-02-15	1	-1/+1
* \| \| \| \|	Merge pull request #23631 from y-yagi/generate_mailer_views_in_api	Yves Senn	2016-02-15	4	-4/+20
\|\ \ \ \ \
\| * \| \| \| \|	generate mailer views in Rails API	yuuji.yaginuma	2016-02-15	4	-4/+20
* \| \| \| \| \|	test runner, relay minitest information about the error location.	Yves Senn	2016-02-15	2	-2/+2
* \| \| \| \| \|	Revert "Prefer Minitest's location for test failures."	Yves Senn	2016-02-15	2	-9/+3
* \| \| \| \| \|	Merge pull request #23688 from meinac/guide_typo_fix	Eileen M. Uchitelle	2016-02-15	3	-3/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix small typo in Rails guides [ci skip]	Mehmet Emin İNAÇ	2016-02-15	3	-3/+3
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #23687 from vipulnsward/add-on-weekday	David Heinemeier Hansson	2016-02-15	4	-1/+24
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add `#on_weekday?` method to `Date`, `Time`, and `DateTime`.	Vipul A M	2016-02-15	4	-1/+24
* \| \| \| \| \| \|	Merge pull request #23684 from vs4vijay/master	Eileen M. Uchitelle	2016-02-15	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Corrected secret_key_base	vs4vijay	2016-02-15	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #23569 from Gaurav2728/no_doc_of_some_railtie_methods	Vipul A M	2016-02-15	1	-4/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	mark as #:nodoc: [ci skip]	Gaurav Sharma	2016-02-15	1	-4/+7
* \| \| \| \| \| \|	Merge pull request #23664 from y-yagi/remove_test_order_from_environment_file	Yves Senn	2016-02-15	1	-3/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	remove `active_support.test_order` from environment file	yuuji.yaginuma	2016-02-14	1	-3/+0
* \| \| \| \| \| \| \|	Merge pull request #23667 from meinac/remove_override_method	Yves Senn	2016-02-15	1	-13/+0
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove the method already overridden by private method	Mehmet Emin İNAÇ	2016-02-14	1	-13/+0
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #23670 from yui-knk/update_dalli	Yves Senn	2016-02-15	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Update dalli gem	yui-knk	2016-02-14	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #23678 from kamipo/remove_deprecated_never_unpermitted_params	Eileen M. Uchitelle	2016-02-14	2	-16/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove `const_missing` which fallback to deprecated `NEVER_UNPERMITTED_PARAMS`	Ryuta Kamizono	2016-02-15	2	-16/+0
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #23505 from kaspth/inject-rails-config-through-railtie	Kasper Timm Hansen	2016-02-14	6	-54/+16
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Don't rely on the global server as a receiver.	Kasper Timm Hansen	2016-02-14	3	-10/+4
\| * \| \| \| \| \| \|	Default connection class to ActionCable::Connection::Base.	Kasper Timm Hansen	2016-02-14	4	-18/+6
\| * \| \| \| \| \| \|	Inject Rails' channel paths in engine.	Kasper Timm Hansen	2016-02-14	5	-26/+6
* \| \| \| \| \| \| \|	Merge pull request #23674 from xw19/dev-tools-update	Jon Moss	2016-02-14	1	-0/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	[ci skip] line_statistics added to README	Sourav Moitra	2016-02-14	1	-0/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #23648 from xw19/link_to-data-nil-test	Yves Senn	2016-02-14	2	-0/+7
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Test to check if the data-attr if nil is same or not	Sourav Moitra	2016-02-14	2	-0/+7
\|/ / / / / / /
* \| / / / / /	restores the guides layout header [ci skip]	Xavier Noria	2016-02-13	1	-1/+11
\| \|/ / / / / \|/\| \| \| \| \|