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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Add missing requires	Santiago Pastorino	2011-05-11	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #515 from joshk/patch-3	José Valim	2011-05-11	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updated the ActiveSupport changelog
\| * \| \| \| \| \| \|	updated the ActiveSupport changelog	Josh Kalderimis	2011-05-11	1	-0/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	add missing require for ordered_hash dependency	Corin Langosch	2011-05-11	1	-0/+1
\|/ / / / / / /
* \| \| \| \| \| \|	make sure log file is written in binary mode. fixes #497	Aaron Patterson	2011-05-10	2	-0/+41
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #490 from vijaydev/patch-4	Piotr Sarnacki	2011-05-10	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace LH with GitHub url for filing issues
\| * \| \| \| \| \| \|	Replace LH with GitHub url for filing issues	Vijay Dev	2011-05-10	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merging 3.0.x CHANGELOGs	Guillermo Iguaran	2011-05-10	1	-0/+28
\|/ / / / / / /
* \| \| \| \| \| \|	Update copyright year in Active Resource and Active Support	Vijay Dev	2011-05-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* \| \| \| \| \| \|	Fix failing test.	José Valim	2011-05-09	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	xml_mini.rb:_dasherize() replacement 20 to 25% faster	Mike Howard	2011-05-09	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: José Valim <jose.valim@gmail.com>
* \| \| \| \| \| \|	Just a minor fix in A.S CHANGELOG	Guillermo Iguaran	2011-05-08	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	adds code examples for negative ordinalize	Vijay Dev	2011-05-08	1	-1/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #445 from prakashmurthy/lighthouse_6334	Aaron Patterson	2011-05-08	1	-0/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for Lighthouse ticket # 6334 : to_xml should render valid xml or raise an error all the time
\| * \| \| \| \| \| \|	Lighthouse ticket # 6334; added tests to verify that spaces in key are ↵	prakashmurthy	2011-05-08	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dasherized.
* \| \| \| \| \| \| \|	Merge pull request #388 from smartinez87/remove_method	José Valim	2011-05-08	1	-2/+3
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Better use #remove_possible_method here
\| * \| \| \| \| \| \|	Better use #remove_possible_method here	Sebastian Martinez	2011-05-08	1	-2/+3
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	indifferent access should recurse Hash subclasses	David Lee	2011-05-08	5	-5/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit makes Hash subclasses convert to HWIA by default for nested objects of subclasses of Hash, but allows certain subclasses to prevent nested conversion by introducing Hash#nested_under_indifferent_access that subclasses can overwrite. ActiveSupport::OrderedHash is one such subclass that overwrites +nested_under_indifferent_access+, since implicitly converting it to HWIA would remove the ordering of keys and values in Ruby 1.8. This change is necessary because commit ce9456e broke nested indifferent access conversion for all subclasses of Hash.
* \| \| \| \| \| \|	Merge pull request #430 from dlee/methodoverride	José Valim	2011-05-08	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logs should show overridden method; Issue 426
\| * \| \| \| \| \| \|	Logs should show overridden method; Issue 426	David Lee	2011-05-07	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix failing xml mini test.	José Valim	2011-05-08	1	-1/+4
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Rename duplicate tests. There is now one failing test that was failing ↵	Mike Gehard	2011-05-07	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	before the rename but was never getting run.
* \| \| \| \| \| \|	Revert "Merge pull request #275 from pk-amooma/master"	José Valim	2011-05-07	2	-14/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Several AP tests fail after this change. This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed.
* \| \| \| \| \| \|	xml_mini_test.rb now runs.	José Valim	2011-05-07	2	-8/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	ordinalize negative numbers patch	Jason	2011-05-07	2	-2/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Applied patch by Amir Manji https://github.com/rails/rails/issues/437#issuecomment-1116045 Signed-off-by: Jason <jasonmichaelroth@gmail.com>
* \| \| \| \| \| \|	Merge pull request #286 from jasoncodes/marshal_subsec	José Valim	2011-05-07	2	-0/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix marshal round-tripping of fractional seconds (Time#subsec).
\| * \| \| \| \| \| \|	Fix marshal round-tripping of fractional seconds (Time#subsec).	Jason Weathered	2011-04-17	2	-0/+8
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #275 from pk-amooma/master	José Valim	2011-05-07	2	-2/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	properly escape "'" to "'" for XML
\| * \| \| \| \| \| \|	test "Escapes special HTML/XML characters" do ...	Philipp Kempgen	2011-04-26	1	-0/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	for escaping HTML can be treated as normal XML	Philipp Kempgen (Amooma)	2011-04-14	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	properly escape "'" to "'" for XML/HTML (BTW Erubis does that as well)	Philipp Kempgen (Amooma)	2011-04-14	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge remote branch 'rolftimmermans/desc_tracker'	José Valim	2011-05-07	7	-34/+64
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into desc_tracker	Rolf Timmermans	2011-03-27	2	-9/+11
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Revert "Revert "It should be possible to use ↵	Rolf Timmermans	2011-03-13	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveSupport::DescendantTracker without getting ActiveSupport::Dependencies for free."" This reverts commit 9f5b1e1ed08df9dbedded0a6b7798d919d43b9a6. Tests have been refactored so they pass in isolation.
\| * \| \| \| \| \| \| \|	Refactored AS::DescendantsTracker test cases so they can be tested without ↵	Rolf Timmermans	2011-03-13	3	-27/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AS::Dependencies.
\| * \| \| \| \| \| \| \|	Missing dependency in MultiByte test.	Rolf Timmermans	2011-03-13	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add missing dependency string inflection test.	Rolf Timmermans	2011-03-13	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Missing dependency for duration test.	Rolf Timmermans	2011-03-13	1	-0/+1
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #248 from bigfix/enumerable_as_json	José Valim	2011-05-07	2	-10/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enumerable should pass encoding options to children in #as_json/#to_json
\| * \| \| \| \| \| \| \|	Enumerable should pass encoding options to children in #as_json/#to_json.	John Firebaugh	2011-04-01	2	-10/+27
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #349 from bradley178/master	José Valim	2011-05-07	2	-3/+10
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|	Hash.from_xml chokes on empty CDATA
\| * \| \| \| \| \| \| \|	Fix bug with empty CDATA not being handled in Hash.from_xml	Bradley Harris	2011-04-29	2	-3/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added test for empty CDATA bug in from_xml	Bradley Harris	2011-04-29	1	-2/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Move variables to underscore format, update protected instance variables list.	José Valim	2011-05-06	2	-6/+16
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	minitest/ruby19 compatible performance test	Jan Xie	2011-05-05	1	-43/+88
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Prepare for beta1	David Heinemeier Hansson	2011-05-04	1	-1/+1
\| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Use #remove_possible_method instead	Sebastian Martinez	2011-05-04	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Relax this dependency a bit.	José Valim	2011-05-04	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	convert strings to lambdas so we can use a consistent interface to the ↵	Aaron Patterson	2011-05-01	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	objects in the collection
* \| \| \| \| \| \| \|	assert_difference can take a callable piece of code rather than just evaling ↵	Aaron Patterson	2011-05-01	1	-4/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a string