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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \|	changed xml type datetime to dateTime, fixes #6328	Angelo capilleri	2012-05-23	4	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	XmlMini define the xml 'datatime', but according to http://www.w3.org/TR/xmlschema-2/#dateTime could be better change this to 'dateTime' with upper case letter 'T. So 'DateTime' and 'Time' are redefined from 'datetime' to 'dateTime' add the changing to the changelog
* \|	Fix the build	Santiago Pastorino	2012-05-22	1	-0/+1
\| \|
* \|	require active_support/lazy_load_hooks where is needed	Santiago Pastorino	2012-05-22	2	-1/+1
\| \|
* \|	refactor lazy_load_hooks load position	Jan Xie	2012-05-22	2	-1/+1
\| \|
* \|	remove useless require	Jan Xie	2012-05-22	1	-1/+0
\| \|
* \|	Merge pull request #5125 from winston/log_exception_when_cache_read_fails	Michael Koziarski	2012-05-21	2	-1/+11
\|\ \ \| \| \| \| \| \|	#read_entry in ActiveSupport::Cache::FileStore should log details of the exception when an exception is thrown
\| * \|	#read_entry in ActiveSupport::Cache::FileStore should log details of the ↵	Winston	2012-02-22	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \|	exception when an exception is thrown.
* \| \|	Add instance_accessor option to class_attribute	Alexey Vakhov	2012-05-22	3	-2/+13
\| \| \|
* \| \|	Improve docs for `try` by adding note on `BasicObject`	Piotr Sarnacki	2012-05-20	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] closes #5790
* \| \|	Don't use assert_block method. It will be deprecated.	kennyj	2012-05-20	1	-1/+1
\| \| \|
* \| \|	Fix warning: shadowing outer local variable - constant.	kennyj	2012-05-19	1	-3/+3
\| \| \|
* \| \|	Add CHANGELOG entry for constantize - closes #6165.	Andrew White	2012-05-19	1	-0/+2
\| \| \|
* \| \|	Handle case where ancestor is not the end of the chain	Andrew White	2012-05-19	2	-7/+14
\| \| \|
* \| \|	Fix constantize so top level constants are looked up properly.	Marc-Andre Lafortune	2012-05-19	2	-1/+19
\| \| \|
* \| \|	Make constantize look down the ancestor chain (excluding Object)	Marc-Andre Lafortune	2012-05-19	2	-1/+30
\| \|/ \|/\|
* \|	Merge pull request #6376 from jgaskins/timestamp-microseconds	Jeremy Kemper	2012-05-18	2	-1/+4
\|\ \ \| \| \| \| \| \|	Increase numeric-timestamp precision to nanoseconds
\| * \|	Increase `AR#cache_key` precision to nanoseconds	Jamie Gaskins	2012-05-19	2	-1/+4
\| \| \|
* \| \|	Merge pull request #6183 from nashby/fix-issue-6179	Jeremy Kemper	2012-05-18	5	-40/+65
\|\ \ \ \| \| \| \| \| \| \| \|	wrap time ranges with timezones
\| * \| \|	respect nsec in TimeWithZone	Vasiliy Ermolovich + Sergey Nartimov	2012-05-18	5	-40/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when we pass fractional usec to Time methods we should use Rational instead of Float because of accuracy problem Time.local(2011,6,12,23,59,59,999999.999).nsec # => 999999998 Time.local(2011,6,12,23,59,59,Rational(999999999, 1000)).nsec # => 999999999
\| * \| \|	wrap time ranges with timezones, closes #6179	Vasiliy Ermolovich	2012-05-17	2	-3/+20
\| \| \| \|
* \| \| \|	Fix warning: possibly useless use of % in void context	kennyj	2012-05-19	1	-1/+1
\| \| \| \|
* \| \| \|	reverting decoupling of NumberHelper from safe_join and adding tests for ↵	Andrew Mutz	2012-05-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	escaping of delimiters and separators
* \| \| \|	doesn't modify params in SafeBuffer#%	Vasiliy Ermolovich	2012-05-18	2	-3/+8
\| \|/ / \|/\| \|
* \| \|	AS::Callbacks: fix run_callbacks for objects with negative id	Bogdan Gusiev	2012-05-18	1	-1/+1
\| \| \|
* \| \|	Make MockLogger work with blocks.	Rafael Mendonça França	2012-05-17	1	-1/+1
\| \| \|
* \| \|	Fix documentation around duplicable regarding Class and Module.	Mark McSpadden	2012-05-17	1	-1/+1
\| \| \|
* \| \|	Merge pull request #6351 from bogdan/callbacks	José Valim	2012-05-17	1	-16/+3
\|\ \ \ \| \| \| \| \| \| \| \|	AS::Callbacks remove useless code, improve performance
\| * \| \|	AS::Callbacks remove useless code, improve performance	Bogdan Gusiev	2012-05-16	1	-16/+3
\| \| \| \|
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-17	2	-9/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/core.rb
\| * \| \| \|	copy edit and remove nodoc on instance_values method [ci skip]	Vijay Dev	2012-05-17	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	update AS:OrderedHash docs	Francesco Rodriguez	2012-05-16	1	-4/+8
\| \| \| \| \|
\| * \| \| \|	removing 1.8 reference	Francesco Rodriguez	2012-05-16	1	-3/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #6362 from bogdan/callbacks_simplify_statement	José Valim	2012-05-17	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	AS::Callbacks: simplify logical statement
\| * \| \| \| \|	AS::Callbacks: simplify logical statement	Bogdan Gusiev	2012-05-17	1	-2/+2
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #6361 from markmcspadden/issue_6265	José Valim	2012-05-17	2	-26/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove special cases for duplicable? on Class and Module
\| * \| \| \| \|	Remove special cases for duplicable? on Class and Module	Mark McSpadden	2012-05-17	2	-26/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Ensure blocks given to subscriber are properly yield	José Valim	2012-05-17	2	-5/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #6356 from andhapp/fix-bug-with-inflections	José Valim	2012-05-16	2	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fix an issue with inflection
\| * \| \| \| \|	Fix an issue with inflection where my_analyses (in plular form) incorrectly ↵	Anuj Dutta	2012-05-16	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	converted to my_analyasis(in singular form).
* \| \| \| \| \|	Fixed logger bug introduced by #2237	Brian Cardarella	2012-05-17	1	-0/+3
\|/ / / / /
* \| \| \| \|	Revert "Merge pull request #6354 from lest/patch-1"	Carlos Galdino + Rafael Mendonça França	2012-05-16	3	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e8feaff60b9c04d34ad234f7d17b5d2ad9cc7a24, reversing changes made to 9adf28c026070afb78b80027521a4ddddd68d697. Reason: This broke the actionmailer tests
* \| \| \| \|	Merge pull request #6354 from lest/patch-1	Rafael Mendonça França	2012-05-16	3	-5/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	remove unnecessary require
\| * \| \| \| \|	remove unnecessary require	Sergey Nartimov	2012-05-16	3	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- access & filters don't use multibyte ext - transliterate requires only AS::Multibyte but not multibyte ext
* \| \| \| \| \|	fix bad formatting [ci skip]	Vijay Dev	2012-05-17	1	-2/+2
\|/ / / / /
* / / / /	fix safe string interpolation with SafeBuffer#%, closes #6352	Vasiliy Ermolovich	2012-05-16	2	-0/+38
\|/ / / /
* \| \| \|	remove backported string interpolation	Vasiliy Ermolovich	2012-05-15	2	-3/+0
\| \| \| \|
* \| \| \|	Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-master	Aaron Patterson	2012-05-15	2	-0/+23
\|\ \ \ \ \| \|/ / / \|/\| \| \|	[#5559] Do not black out the system timezone DST jump hour if Time.zone ...
\| * \| \|	[#5559] Do not black out the system timezone DST jump hour if Time.zone ↵	Jarkko Laine	2012-03-24	2	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	differs from that. The system timezone DST jump hour should not be blacked out by Time.zone.parse if current Time.zone does not do the jump at that time. Fixes #5559.
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-15	25	-82/+52
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
\| * \| \| \|	missing dot [ci skip]	Vijay Dev	2012-05-15	1	-1/+1
\| \| \| \| \|