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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #9757 from vipulnsward/remove_message_param	Carlos Antonio da Silva	2013-03-17	1	-1/+1
\|\ \| \| \| \|	remove unused parameter passed to assert_query_equal method
\| *	remove unused parameter passed to assert_query_equal method	Vipul A M	2013-03-17	1	-1/+1
\| \|
* \|	Merge pull request #9758 from vipulnsward/remove_from_rakefile	Carlos Antonio da Silva	2013-03-17	1	-2/+0
\|\ \ \| \| \| \| \| \|	Remove extra lines from Rakefile, which threw warning
\| * \|	extra lines from Rakefile removed, which also threw warning	Vipul A M	2013-03-17	1	-2/+0
\| \|/
* /	refactor test to drop unnecessary hash creation, test directly instead	Vipul A M	2013-03-17	1	-16/+10
\|/
*	Revert "Merge pull request #8156 from fredwu/acronym_fix-master"	Steve Klabnik	2013-03-16	3	-8/+1
\| \| \| \| \| \| \| \| \|	This reverts commit 867dc1700f32aae6f98c4651bd501597e6b52bc0, reversing changes made to 9a421aaa8285cf2a7ecb1af370748b0337818930. This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065 Please see comments on #8156 for some discussion.
*	revises the CHANGELOG entry from 26aa265 [ci skip]	Xavier Noria	2013-03-16	1	-2/+3
\|
*	Added Inflector#underscore fix to the changelog	Fred Wu	2013-03-17	1	-0/+4
\|
*	Fixed a bug where the inflector would replace camelCase strings and ↵	Fred Wu	2013-03-17	2	-1/+3
\| \| \| \|	disregarding specified acronyms, fixes #8015
*	Revert "make new rails apps log to STDOUT"	Steve Klabnik	2013-03-15	2	-19/+0
\| \| \| \| \| \|	This reverts commit b7d9d6e2cd5082d269dafbc0316e2107febe1451. Per discussion with @jeremy and @rubys on Campfire.
*	make new rails apps log to STDOUT	Terence Lee	2013-03-15	2	-0/+19
\|
*	Add regression tests for #9678	Andrew White	2013-03-13	1	-0/+16
\| \| \| \| \|	The bug with `ActiveSupport::TimeZone.parse` described in #9678 was unwittingly fixed in 005d910 so add some tests to prevent regression.
*	removing out of date comment. ↵	Aaron Patterson	2013-03-12	1	-3/+0
\| \| \| \|	:heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart: @pixeltrix
*	drop memory consumption and startup speed by switching to define_method	Aaron Patterson	2013-03-12	1	-23/+28
\|
*	Remove manual "return true" from AS::TZ match method	Carlos Antonio da Silva	2013-03-12	1	-1/+1
\|
*	Merge pull request #9681 from vipulnsward/fix_typo_in_module_name	Carlos Antonio da Silva	2013-03-12	4	-7/+7
\|\ \| \| \| \|	Fix typo in DependenciesTestHelpers module name
\| *	Fix typo in DependenciesTestHelpers module name	Vipul A M	2013-03-12	4	-7/+7
\| \|
* \|	Cleanup tests for unused variables	Vipul A M	2013-03-11	2	-3/+1
\|/
*	Fixed tests for returning an instance of `Time` in the local system timezone.	Paul Nikitochkin	2013-03-10	1	-5/+5
\|
*	included "Montevideo" in list of time zone aliases (closes Issue #9628)	Gernot	2013-03-09	1	-0/+1
\|
*	CHANGELOG entry for improved singularizing of singulars.	Yves Senn	2013-03-06	1	-1/+14
\| \| \| \| \| \|	Closes #9559. The actual patch was added with #4719
*	Call String#gsub with Hash directly	Aman Gupta	2013-03-04	1	-2/+2
\|
*	only calculate next_id when we need a new method defined	Aaron Patterson	2013-03-04	1	-1/+2
\|
*	Enforce i18n version >= v0.6.4	Carlos Antonio da Silva	2013-02-27	1	-1/+1
\| \| \| \|	Keep in sync with 3-2-stable.
*	Move AS CHANGELOG entry up.	Steve Klabnik	2013-02-26	1	-2/+3
\| \| \| \|	I merged b883706 but forgot to move the entry past beta1.
*	Merge pull request #9329 from chuckbjones/fix-cache-delete-rc	Steve Klabnik	2013-02-26	3	-2/+16
\|\ \| \| \| \|	Fix deletion of empty directories
\| *	Fix deletion of empty directories:	Charles Jones	2013-02-25	3	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. When comparing the directory to delete against the top level cache_path, use File.realpath to make sure we aren't comparing two unequal strings that point to the same path. This occurs, for example, when cache_path has a trailing slash, which it does in the default Rails configuration. Since the input to delete_empty_directories never has a trailing slash, the comparison will never be true and the top level cache directory (and above) may be deleted. However… 2. File.delete raises EPERM when trying to delete a directory, so no directories have ever been deleted. Changing the code to Dir.delete fixes that.
* \|	We want i18n >= 0.6.2 but < 1.0	Santiago Pastorino	2013-02-26	1	-1/+1
\| \|
* \|	Update CHANGELOGS	Rafael Mendonça França	2013-02-26	1	-0/+3
\| \|
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-02-26	1	-2/+2
\|\ \ \| \|/ \|/\|
\| *	Corrected link anchor and added colons for continuity	Doug Yun	2013-02-19	1	-2/+2
\| \|
* \|	Bump i18n version to 0.6.2	Guillermo Iguaran	2013-02-25	1	-1/+1
\| \|
* \|	Preparing for 4.0.0.beta1 release	David Heinemeier Hansson	2013-02-25	2	-2/+2
\| \|
* \|	Keep second fraction when DateTime#change is called.	Chris Baynes	2013-02-25	3	-1/+9
\| \|
* \|	Revert "Simplify code in AS json encoder"	Guillermo Iguaran	2013-02-25	1	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 046e27a7338f2961c10e9d133e0e2229b51c2ba8. Check https://github.com/rails/rails/pull/8815#issuecomment-14026122 for details.
* \|	Merge pull request #8815 from bogdan/simplified-to-json-args	Steve Klabnik	2013-02-24	1	-15/+8
\|\ \ \| \| \| \| \| \|	AS JSON encoder: remove monkey patch of Array
\| * \|	Simplify code in AS json encoder	Bogdan Gusiev	2013-01-06	1	-15/+8
\| \| \|
* \| \|	Add more information to the CHANGELOG entry [ci skip]	Rafael Mendonça França	2013-02-24	1	-0/+12
\| \| \|
* \| \|	Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility.	stopdropandrew	2013-02-24	3	-0/+19
\| \| \|
* \| \|	did a pass over the AS changelog [ci skip]	Xavier Noria	2013-02-24	1	-55/+61
\| \| \|
* \| \|	Revert "prevent minitest from printing a --seed run option"	Xavier Noria	2013-02-24	1	-12/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reason: on a second thought, minitest prints a seed as run option regardless of the test order, and it actually calls srand, so albeit it might be misleading I believe, it is the way it is and should be left that way. This reverts commit c15862ae0cb876d745609170f0f90a9bb9b5e0ae.
* \| \|	prevent minitest from printing a --seed run option	Xavier Noria	2013-02-24	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \|	See the first FIXME comment in the patch for the rationale.
* \| \|	Move number_to_human test from AP to AS	Carlos Antonio da Silva	2013-02-22	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since all changes from #9347 are related to AS, it seems proper that the test is placed there as well.
* \| \|	Changelog improvements, use 1.9 style hash in examples [ci skip]	Carlos Antonio da Silva	2013-02-22	1	-13/+12
\| \| \|
* \| \|	Merge pull request #9347 from hoffm/number_to_human_bug	Steve Klabnik	2013-02-22	2	-1/+14
\|\ \ \ \| \| \| \| \| \| \| \|	Address edge case for number_to_human with units option.
\| * \| \|	Address edge case for number_to_human with units option.	hoffm	2013-02-22	2	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when the units hash does not contain the needed key, e.g. when the number provided is less than the largest key provided.
* \| \| \|	Correct comment for (beginning\|end)_of_minute	Gert Goet	2013-02-22	2	-4/+4
\|/ / /
* \| \|	Added beginning_of_minute support to core_ext calculations for Time and DateTime	Gagan Awhad	2013-02-21	6	-0/+61
\| \| \|
* \| \|	moves the new :nsec date format to the Active Support changelog [ci skip]	Xavier Noria	2013-02-20	1	-0/+4
\| \| \|
* \| \|	Bump up minitest dependency and remove our own reinvented version of ↵	Akira Matsuda	2013-02-19	2	-38/+2
\| \|/ \|/\| \| \| \| \|	ParallelEach