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

	Commit message (Expand)	Author	Age	Files	Lines
*	Show proper error message when a non-relation object is passed to AR::Relatio...	Prathamesh Sonpatki	2016-02-17	2	-0/+10
*	Merge pull request #23726 from akshaymohite/fix-test-names-in-batches-test	Rafael França	2016-02-17	1	-2/+2
\|\
\| *	Fix semantics of test names for finish option in batches_test	Akshay	2016-02-17	1	-2/+2
\|/
*	Fix typo	Rafael Mendonça França	2016-02-17	1	-1/+1
*	Merge pull request #23712 from bf4/incorrect_to_accept_json_api_and_not_rende...	Rafael França	2016-02-17	2	-10/+3
\|\
\| *	The JSON API media type should only work wih a JSON API handler	Benjamin Fleischer	2016-02-16	2	-10/+3
* \|	Merge pull request #23713 from collectiveidea/add-store-attributes-test	Rafael França	2016-02-17	1	-0/+1
\|\ \
\| * \|	Test parent local_stored_attributes isn't modified	David Genord II	2016-02-16	1	-0/+1
\| \|/
* \|	Fix code style	Rafael Mendonça França	2016-02-17	1	-3/+4
* \|	adds --skip-listen to the application generator [closes #23590]	Xavier Noria	2016-02-17	6	-13/+42
* \|	Merge pull request #23661 from meinac/add_gzip_mime_type	Richard Schneeman	2016-02-16	3	-1/+6
\|\ \
\| * \|	application/gzip added as default mime type into mime type list	Mehmet Emin İNAÇ	2016-02-13	3	-1/+6
* \| \|	Merge pull request #23705 from chi6rag/master	Vipul A M	2016-02-17	1	-1/+5
\|\ \ \
\| * \| \|	[ci skip] Updating edge rails guides to include `on_weekday?` on Date, Time a...	Chirag Aggarwal	2016-02-17	1	-1/+5
\|/ / /
* \| \|	Merge pull request #23203 from vipulnsward/22979-show-tags-on-exception	Richard Schneeman	2016-02-16	3	-12/+16
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	WIP: Errors in logs should show log tags as well.	Vipul A M	2016-02-12	3	-12/+16
* \| \|	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