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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Remove outdated TODO from url_for test, this test was fixed in 900a2d30	Zachary Scott	2014-02-09	1	-3/+0
\| \|/ / / / / /
* \| \| \| \| / /	Remove end of line whitespace from bb87c16	Zachary Scott	2014-02-09	1	-4/+4
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #13983 from hsbt/remove-warning	Godfrey Chan	2014-02-09	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use File.exist? instead of File.exists?
\| * \| \| \| \| \|	use File.exist? instead of File.exists?	SHIBATA Hiroshi	2014-02-09	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	use feature detection to decide which implementation to use	Aaron Patterson	2014-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decouple the code from the particular Ruby version.
* \| \| \| \| \|	Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafe	Aaron Patterson	2014-02-08	5	-4/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reaper has access to threadsafe active? call
\| * \| \| \| \| \|	Reaper has access to threadsafe active? call	Kevin Casey	2014-02-08	5	-4/+15
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #13978 from Fortisque/kevin/validation_context_for_children	Aaron Patterson	2014-02-08	4	-1/+27
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	context in validation goes through has many relationship
\| * \| \| \| \| \| \|	context in validation goes through has many relationship	Kevin Casey	2014-02-08	4	-1/+27
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #13980 from ↵	Aaron Patterson	2014-02-08	1	-2/+6
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mellowi/skipping_linked_folder_tests_if_symlink_is_invalid Skips linked folder tests if symlink is invalid
\| * \| \| \| \| \| \|	Skips linked folder tests if symlink is invalid	Mikko Johansson	2014-02-09	1	-2/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #13979 from mellowi/windows_disallowed_static_files_skipped	Aaron Patterson	2014-02-08	1	-2/+7
\|\\| \| \| \| \| \| \| \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	Skips tests on Windows that create files with illegal characters
\| * \| \| \| \| \|	Skips tests on Windows that create files with illegal characters	Mikko Johansson	2014-02-09	1	-2/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #13977 from Octember/master	Aaron Patterson	2014-02-08	2	-0/+20
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Fixed an issue where reloading of removed dependencies would cause an un...
\| * \| \| \| \| \|	Fixed an issue where reloading of removed dependencies would cause an ↵	Noah Lindner	2014-02-08	2	-0/+20
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unexpected circular dependency error
* \| \| \| \| \|	Merge pull request #13974 from ↵	Rafael Mendonça França	2014-02-08	3	-0/+33
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	laurocaetano/test_case_for_autosave_with_accepts_nested_attributes Add test case for autosave association with nested attributes.
\| * \| \| \| \|	Add test case for autosave HasMany with accepts_nested_attributes.	Lauro Caetano	2014-02-08	3	-0/+33
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It should not save the parent record when the nested attributes are invalid. Test case to cover #8194.
* \| \| \| \|	Updated the cookie docs to use the safer JSON.{generate,parse}	Godfrey Chan	2014-02-08	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cc @senny
* \| \| \| \|	Rely on backticks instead of tt tags [ci skip]	Robin Dupret	2014-02-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the language in code blocks is inferred, if the code contains tt tags, the block will be parsed as XML for instance while it is Ruby.
* \| \| \| \|	docs, Cookie values are String based. Closes #12860. [ci skip]	Yves Senn	2014-02-08	1	-7/+7
\| \| \| \| \|
* \| \| \| \|	Adjust test value so that timezone has no effect	Andrew White	2014-02-07	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the test is run in a timezone that is behind UTC it fails because the time generated is ahead of 0000-01-01 00:00:00. Just increase the time subtracted so that timezone has no effect.
* \| \| \|	Merge pull request #13952 from prathamesh-sonpatki/testing	Yves Senn	2014-02-07	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[Testing Guide] Mention :unauthorized in assert_response explanation [ci skip]
\| * \| \| \|	[Testing Guide] Mention :unauthorized in assert_response explanation [ci skip]	Prathamesh Sonpatki	2014-02-07	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #13967 from fphilipe/fix-missing-action-view-const	Yves Senn	2014-02-07	2	-0/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Require action_view to fix missing constant ENCODING_FLAG
\| * \| \| \| \|	Require action_view to fix missing constant	Philipe Fatio	2014-02-07	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, requiring action_view/view_paths did cause an uninitialized constant error for ENCODING_FLAG, which is defined in action_view.
* \| \| \| \| \|	Merge pull request #13968 from kintamanimatt/fix-wordy-sentence	Yves Senn	2014-02-07	1	-6/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fix wordy sentence [ci-skip]
\| * \| \| \| \|	Fix wordy sentence	Matthew Nicholas Bradley	2014-02-07	1	-6/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #13962 from iwiznia/test_controller_skip_action_class	Yves Senn	2014-02-07	1	-0/+16
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Test for skipping a controller filter set up with a class Part 3
\| * \| \| \|	Tests that skips a controller filters that was set up using a class	Ionatan Wiznia	2014-02-06	1	-0/+16
\|/ / / /
* \| \| \|	Merge branch 'dump-schema-after-migration-flag' of ↵	Xavier Noria	2014-02-06	8	-1/+84
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git://github.com/emilsoman/rails into emilsoman-dump-schema-after-migration-flag Conflicts: activerecord/CHANGELOG.md
\| * \| \| \|	Add config to disable schema dump after migration	Emil Soman	2014-02-06	8	-1/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add a config on Active Record named `dump_schema_after_migration` * Schema dump doesn't happen if the config is set to false * Set default value of the config to true * Set config in generated production environment file to false * Update configuration guide * Update CHANGELOG
* \| \| \| \|	docs, Associations also raise on name conflicts. [ci skip]	Yves Senn	2014-02-06	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow up to https://github.com/rails/rails/commit/580f0b61dc99c6854fa930a761d28a3ab08163f7#commitcomment-5293470
* \| \| \| \|	synchronize 4.1 release notes with CHANGELOGS. [ci skip]	Yves Senn	2014-02-06	5	-17/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	/cc @chancancode
* \| \| \| \|	update contribution doc grammar. [ci skip]	dpmehta02	2014-02-06	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Manually applied from #13951. - Discussion at #13947. - Removed trailing whitespace from https://github.com/dpmehta02/rails/commit/18044e86af93672dfc38befbe974261e87b3518d /cc @dpmehta02
* \| \| \| \|	Fix to_query with empty arrays too	Rafael Mendonça França	2014-02-06	2	-1/+8
\| \| \| \| \|
* \| \| \| \|	Add CHANGELOG entry	Rafael Mendonça França	2014-02-05	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13909
* \| \| \| \|	Refatoring the method to avoid shot-circuit return	Rafael Mendonça França	2014-02-05	2	-4/+9
\| \| \| \| \|
* \| \| \| \|	Test with a blank value	Rafael Mendonça França	2014-02-05	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Move test to the right file	Rafael Mendonça França	2014-02-05	2	-11/+9
\| \| \| \| \|
* \| \| \| \|	Fixed "Hash#to_param confused by empty hash values #13892"	Hincu Petru	2014-02-05	2	-0/+12
\| \| \| \| \|
* \| \| \| \|	Merge pull request #13953 from seanwalbran/fix-humanize-match-reference	Rafael Mendonça França	2014-02-05	2	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	fix interplay of humanize and html_escape
\| * \| \| \| \|	fix interplay of humanize and html_escape	Sean Walbran	2014-02-05	2	-1/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #13938 from marcandre/sized_enumerator	Rafael Mendonça França	2014-02-05	7	-30/+53
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Sized enumerator
\| * \| \| \| \|	Return sized enumerator from Enumerable#index_by	Marc-Andre Lafortune	2014-02-05	3	-7/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Return sized enumerator from Batches#find_each	Marc-Andre Lafortune	2014-02-05	6	-4/+26
\| \| \| \| \| \|
\| * \| \| \| \|	Return sized enumerator from Batches#find_in_batches	Marc-Andre Lafortune	2014-02-05	3	-4/+25
\| \| \| \| \| \|
\| * \| \| \| \|	Strengthen test with different nb of rows and columns	Marc-Andre Lafortune	2014-02-05	1	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Remove obsolete test (builtin group_by is now used)	Marc-Andre Lafortune	2014-02-05	1	-20/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Remove obsolete line (was needed for Ruby 1.8.7 support)	Marc-Andre Lafortune	2014-02-05	1	-1/+0
\|/ / / / /
* \| \| \| \|	remove gemnasium batch from README. [ci skip]	Yves Senn	2014-02-05	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The rails/rails gemnasium page (https://gemnasium.com/rails/rails) is not helping much. It lists 0 dependencies so there is not much to track. Also our gems mostly depend on other gems we control. There is not much point in monitoring them. The batch was introduced with #3909.