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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2010-12-23	4	-2/+19
\|\
\| *	expand on set_callback method to explain that in	Neeraj Singh	2010-12-21	1	-0/+4
\| \| \| \| \| \| \| \|	some cases an implicit :before is assumed
\| *	Improve documentation on ActiveSupport::Deprecation.	Ryan Bigg	2010-12-21	3	-2/+15
\| \|
* \|	Fix activesupport tests. These classes are not used anywhere	Piotr Sarnacki	2010-12-22	1	-12/+0
\| \|
* \|	Ensure that uncountable are removed after test	Piotr Sarnacki	2010-12-22	1	-5/+6
\| \|
* \|	Added a word boundary to uncountable inflection regex for #singularize so ↵	John Paul Ashenfelter	2010-12-22	2	-1/+28
\|/ \| \| \|	short inflections like ors do not affect larger words like sponsors [#6093 state:resolved]
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2010-12-20	1	-1/+1
\|\
\| *	Fix the example in ActiveSupport::Concern	zhengjia	2010-12-17	1	-1/+1
\| \|
* \|	Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepare	John Firebaugh	2010-12-20	2	-2/+2
\|/ \| \| \|	Signed-off-by: José Valim <jose.valim@gmail.com>
*	Replace nested ifs with case/when	Pavel Gorbokon	2010-12-07	1	-46/+44
\| \| \| \|	Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
*	Ommit nil in method call	Pavel Gorbokon	2010-12-07	1	-1/+1
\| \| \| \|	Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2010-12-05	3	-4/+16
\|\
\| *	Remove extra f	Ryan Bigg	2010-12-03	1	-1/+1
\| \|
\| *	Add comment for config_accessor method	Neeraj Singh	2010-11-30	1	-0/+12
\| \|
\| *	Merge branch 'master' of https://github.com/cylence/docrails into cylence-master	Aditya Sanghi	2010-11-29	1	-1/+1
\| \|\
\| \| *	Corrected typo and wording.	Ryan L. Cross	2010-10-24	1	-1/+1
\| \| \|
\| * \|	Resolves LH #6063, should be :expires_in not :expire_in	Aditya Sanghi	2010-11-27	1	-2/+2
\| \| \|
* \| \|	:method: is not needed when RDoc can detect it	Santiago Pastorino	2010-12-02	1	-5/+0
\|/ /
* \|	Only convert direct hash instances in hash with indifferent access.	José Valim	2010-11-26	2	-4/+11
\| \|
* \|	Rakefiles are executables, and rake loads rake, not rakefile code	raggi	2010-11-25	1	-0/+0
\| \|
* \|	Don't depend on rubygems loading thread (for Mutex)	raggi	2010-11-25	2	-0/+2
\| \|
* \|	class inheritable attributes is used no more! all internal use of class ↵	Josh Kalderimis	2010-11-20	2	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \|	inheritable has been changed to class_attribute. class inheritable attributes has been deprecated. Signed-off-by: José Valim <jose.valim@gmail.com>
* \|	I18n is always loaded on boot by Active Model or Action Pack, so no need for ↵	José Valim	2010-11-20	1	-1/+0
\| \| \| \| \| \| \| \|	supporting lazy hooks.
* \|	applies API conventions to the RDoc of json_encode	Xavier Noria	2010-11-20	1	-10/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Examples running with the text are preferred over separate Example sections. * No need to call puts, in # => we show the return value, not STDOUT. * Say explicitly that double quotes are removed. * Specify that we are talking \uXXX, rather than, say, HTML entities.
* \|	removes orphan tests, custom String#% was removed from AS in 39d6f9e	Xavier Noria	2010-11-19	1	-69/+0
\| \|
* \|	Revert "Quick fix for not escaping []s (not ideal)"	Santiago Pastorino	2010-11-18	3	-9/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to http://www.ietf.org/rfc/rfc2616.txt and http://tools.ietf.org/rfc/rfc3986.txt [ and ] are reserved characters and should be escaped using "%" HEX HEX This reverts commit 856d2fd874d72dd9f83204affff4edfef3308361 and 1ee9b40b18a0bed5bb10a0785f7e2730bac983f6..
* \|	bye bye extlib_inheritable_*, AS callbacks now using class_attribute	Josh Kalderimis	2010-11-18	2	-92/+13
\| \| \| \| \| \| \| \|	Signed-off-by: José Valim <jose.valim@gmail.com>
* \|	Update the version.rb files to include a PRE part	Carl Lerche	2010-11-16	1	-2/+2
\| \|
* \|	using a merge with a Hash[] rather than a loop to add SAX parsed attributes	Aaron Patterson	2010-11-16	1	-2/+1
\| \|
* \|	Add support for try to just yield the object to a block if no method is to ↵	raggi	2010-11-14	2	-1/+23
\| \| \| \| \| \| \| \|	be called. Kind of like a tap_if_present.
* \|	HashWithIndifferentAccess should not change the subclass of an array	Larry Sprock	2010-11-14	2	-1/+18
\| \|
* \|	Merge remote branch 'drogus/plugin_new'	José Valim	2010-11-11	3	-0/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: railties/test/generators/app_generator_test.rb
\| * \|	Added Hash#deep_dup function which performs deep duplication on given hash	Piotr Sarnacki	2010-11-02	3	-0/+27
\| \|/
* \|	Duck typing here	Santiago Pastorino	2010-11-11	1	-1/+1
\| \|
* \|	Fix ActiveSupport::TimeWithZone#localtime method with DateTime	Alvaro Bautista	2010-11-11	2	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \|	[#5344 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* \|	Remove unused method	Santiago Pastorino	2010-11-10	2	-62/+0
\| \|
* \|	Remove useless cgi	Denis Odorcic	2010-11-10	3	-35/+0
\| \| \| \| \| \| \| \| \| \| \| \|	[#5943 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* \|	syncs CHANGELOGs for 3.0.2 in 3-0-stable with the ones in master	Xavier Noria	2010-11-09	1	-0/+4
\| \|
* \|	Test cache.key_file_path with separators ht. Jim Wilson [#5611]	Santiago Pastorino	2010-11-07	1	-0/+5
\| \|
* \|	Fix FileStore cache incorrectly regenerating its key from a pathname when a ↵	Denis Odorcic	2010-11-07	2	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	regexp is used in expire_fragment [#5850 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* \|	Make safe_append= live on AV::OutputBuffer not AS::SafeBuffer	Michael Koziarski	2010-11-08	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: actionpack/lib/action_view/template/handlers/erb.rb
* \|	Added support for Erubis <%== tag	Jan Maurits Faber	2010-11-08	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	<%== x %> is syntactic sugar for <%= raw(x) %> Signed-off-by: Michael Koziarski <michael@koziarski.com> [#5918 status:committed]
* \|	OrderedHash#select now preserves order [#5843 state:resolved]	James A. Rosen	2010-11-07	2	-0/+10
\| \| \| \| \| \| \| \|	Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* \|	Ensure that HashWithIndifferentAccess duplication preserves class (for ↵	laserlemon	2010-11-07	2	-3/+18
\| \| \| \| \| \| \| \| \| \| \| \|	sublclasses) and default value [#5724 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* \|	add more tests surrounding camlize in xmlmini, refactor rename_key()	Aaron Patterson	2010-11-03	2	-6/+14
\| \|
* \|	Allowing to_xml :camelize option to be set to :lower to enable ↵	Jeremy Holland	2010-11-03	3	-4/+17
\|/ \| \| \|	lower-camelcase tags [#5903 state:resolved]
*	save a few method calls	Aaron Patterson	2010-10-22	1	-2/+3
\|
*	removing wtfalse	Aaron Patterson	2010-10-22	1	-1/+1
\|
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2010-10-19	1	-0/+6
\|\
\| *	json_escape makes json invalid doc change [#1485 state:resolved]	Neeraj Singh	2010-10-16	1	-0/+6
\| \|