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

	Commit message (Collapse)	Author	Age	Files	Lines
*	change merge to merge! in AS on new hashes	Vipul A M	2013-04-02	2	-2/+2
\|
*	Merge pull request #9997 from vipulnsward/hash_destructive_merge	Carlos Antonio da Silva	2013-03-30	2	-2/+2
\|\ \| \| \| \|	Change merge to merge! to avoid creating new objects
\| *	change merge to merge!	Vipul A M	2013-03-29	2	-2/+2
\| \|
* \|	Merge pull request #10007 from vipulnsward/fix_AS_typos	Carlos Antonio da Silva	2013-03-30	1	-1/+1
\|\ \ \| \| \| \| \| \|	Fix some typos in AS
\| * \|	fix some typos in AS	Vipul A M	2013-03-30	1	-1/+1
\| \|/
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-03-30	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip]
\| *	Fix some typos	Akira Matsuda	2013-03-25	1	-1/+1
\| \|
* \|	determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn]	Xavier Noria	2013-03-28	1	-0/+2
\| \|
* \|	Merge pull request #9523 from ↵	Rafael Mendonça França	2013-03-27	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stopdropandrew/Instrumenter#instrument-yields-payload ActiveSupport::Notifications::Instrumenter#instrument should yield Conflicts: activesupport/CHANGELOG.md
\| * \|	ActiveSupport::Notifications::Instrumenter#instrument should yield	stopdropandrew	2013-03-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	its payload the same way that ActiveSupport::Notifications does. Fix spelling in test name.
* \| \|	Fixed timezone mapping of Ulaanbaatar.	Zolzaya	2013-03-27	1	-1/+1
\| \| \|
* \| \|	Updated docs due to removal of serializer accessor	Albert Lash	2013-03-24	1	-3/+3
\| \| \|
* \| \|	Merge pull request #8501 from charliesome/version-to-s	Rafael Mendonça França	2013-03-23	1	-6/+7
\|\ \ \ \| \| \| \| \| \| \| \|	Add #to_s method to VERSION modules
\| * \| \|	Add version method to top level modules	Charlie Somerville	2013-03-21	1	-6/+7
\| \| \| \|
* \| \| \|	Tidying up some require : removing useless sort and homogenizing with the ↵	Intrepidd	2013-03-20	1	-2/+2
\|/ / / \| \| \| \| \| \| \| \| \|	rest of the code the wat the includes are done
* \| \|	remove unused payloads in blocks in caching instrumentation	Vipul A M	2013-03-19	1	-3/+3
\| \| \|
* \| \|	Merge branch 'master-sec'	Aaron Patterson	2013-03-18	1	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854]
\| * \| \|	JDOM XXE Protection [CVE-2013-1856]	Ben Murphy	2013-03-15	1	-0/+6
\| \| \|/ \| \|/\|
* \| \|	`TimeWithZone` raises `NoMethodError` in proper context.	Yves Senn	2013-03-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #9772. `TimeWithZone` delegates everything to the wrapped `Time` object using `method_missing`. The result is that `NoMethodError` error will be raised in the context of `Time` which leads to a misleading debug output.
* \| \|	Revert "Merge pull request #8156 from fredwu/acronym_fix-master"	Steve Klabnik	2013-03-16	1	-1/+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.
* \| \|	Fixed a bug where the inflector would replace camelCase strings and ↵	Fred Wu	2013-03-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	disregarding specified acronyms, fixes #8015
* \| \|	Revert "make new rails apps log to STDOUT"	Steve Klabnik	2013-03-15	1	-8/+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	1	-0/+8
\| \| \|
* \| \|	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
\| \| \|
* \| \|	included "Montevideo" in list of time zone aliases (closes Issue #9628)	Gernot	2013-03-09	1	-0/+1
\|/ /
* \|	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
\|/
*	Fix deletion of empty directories:	Charles Jones	2013-02-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
*	Preparing for 4.0.0.beta1 release	David Heinemeier Hansson	2013-02-25	1	-1/+1
\|
*	Keep second fraction when DateTime#change is called.	Chris Baynes	2013-02-25	1	-1/+1
\|
*	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
\| \|
* \|	Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility.	stopdropandrew	2013-02-24	1	-0/+4
\| \|
* \|	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.
* \|	Merge pull request #9347 from hoffm/number_to_human_bug	Steve Klabnik	2013-02-22	1	-1/+1
\|\ \ \| \| \| \| \| \|	Address edge case for number_to_human with units option.
\| * \|	Address edge case for number_to_human with units option.	hoffm	2013-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+27
\| \|
* \|	Bump up minitest dependency and remove our own reinvented version of ↵	Akira Matsuda	2013-02-19	1	-37/+1
\| \| \| \| \| \| \| \|	ParallelEach
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-02-15	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: guides/source/upgrading_ruby_on_rails.md
\| * \|	Change Class#subclasses doc example	Dalibor Nasevic	2013-02-06	1	-2/+2
\| \| \|
* \| \|	Supress warning about method redifinition	Ryunosuke SATO	2013-02-11	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In i18n gem, the following methods are defined. - `Hash#except` - `Hash#slice` But if there are defined already, i18n skips these definitions. So these definition by `active_support` are required before `require 'i18n'`.
* \| \|	Merge pull request #9238 from norman/unicode_62	Carlos Antonio da Silva	2013-02-10	2	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Update to latest Unicode data.
\| * \| \|	Update to latest Unicode data.	Norman Clarke	2013-02-10	2	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Release notes at: http://www.unicode.org/versions/Unicode6.2.0/
* \| \|	Merge pull request #8643 from tricknotes/remove-method-redefined-warning	Andrew White	2013-02-10	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Remove method redefined warning
\| * \| \|	Remove method redefined warning	Ryunosuke SATO	2013-02-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In `i18n` gem, the method definition of `Hash#deep_merge!` is skipped when it is already defined. - warning: method redefined; discarding old deep_merge!