aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-05-182-1/+4
|\ | | | | Increase numeric-timestamp precision to nanoseconds
| * Increase `AR#cache_key` precision to nanosecondsJamie Gaskins2012-05-192-1/+4
| |
* | Merge pull request #6183 from nashby/fix-issue-6179Jeremy Kemper2012-05-185-40/+65
|\ \ | | | | | | wrap time ranges with timezones
| * | respect nsec in TimeWithZoneVasiliy Ermolovich + Sergey Nartimov2012-05-185-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 #6179Vasiliy Ermolovich2012-05-172-3/+20
| | |
* | | Fix warning: possibly useless use of % in void contextkennyj2012-05-191-1/+1
| | |
* | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵Andrew Mutz2012-05-181-0/+1
| | | | | | | | | | | | escaping of delimiters and separators
* | | doesn't modify params in SafeBuffer#%Vasiliy Ermolovich2012-05-182-3/+8
| |/ |/|
* | AS::Callbacks: fix run_callbacks for objects with negative idBogdan Gusiev2012-05-181-1/+1
| |
* | Make MockLogger work with blocks.Rafael Mendonça França2012-05-171-1/+1
| |
* | Fix documentation around duplicable regarding Class and Module.Mark McSpadden2012-05-171-1/+1
| |
* | Merge pull request #6351 from bogdan/callbacksJosé Valim2012-05-171-16/+3
|\ \ | | | | | | AS::Callbacks remove useless code, improve performance
| * | AS::Callbacks remove useless code, improve performanceBogdan Gusiev2012-05-161-16/+3
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-172-9/+12
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb
| * | | copy edit and remove nodoc on instance_values method [ci skip]Vijay Dev2012-05-171-4/+4
| | | |
| * | | update AS:OrderedHash docsFrancesco Rodriguez2012-05-161-4/+8
| | | |
| * | | removing 1.8 referenceFrancesco Rodriguez2012-05-161-3/+2
| | | |
* | | | Merge pull request #6362 from bogdan/callbacks_simplify_statementJosé Valim2012-05-171-2/+2
|\ \ \ \ | | | | | | | | | | AS::Callbacks: simplify logical statement
| * | | | AS::Callbacks: simplify logical statementBogdan Gusiev2012-05-171-2/+2
| | |/ / | |/| |
* | | | Merge pull request #6361 from markmcspadden/issue_6265José Valim2012-05-172-26/+2
|\ \ \ \ | | | | | | | | | | Remove special cases for duplicable? on Class and Module
| * | | | Remove special cases for duplicable? on Class and ModuleMark McSpadden2012-05-172-26/+2
| | | | |
* | | | | Ensure blocks given to subscriber are properly yieldJosé Valim2012-05-172-5/+6
| | | | |
* | | | | Merge pull request #6356 from andhapp/fix-bug-with-inflectionsJosé Valim2012-05-162-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | Fix an issue with inflection
| * | | | Fix an issue with inflection where my_analyses (in plular form) incorrectly ↵Anuj Dutta2012-05-162-1/+2
| | | | | | | | | | | | | | | | | | | | converted to my_analyasis(in singular form).
* | | | | Fixed logger bug introduced by #2237Brian Cardarella2012-05-171-0/+3
|/ / / /
* | | | Revert "Merge pull request #6354 from lest/patch-1"Carlos Galdino + Rafael Mendonça França2012-05-163-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e8feaff60b9c04d34ad234f7d17b5d2ad9cc7a24, reversing changes made to 9adf28c026070afb78b80027521a4ddddd68d697. Reason: This broke the actionmailer tests
* | | | Merge pull request #6354 from lest/patch-1Rafael Mendonça França2012-05-163-5/+1
|\ \ \ \ | | | | | | | | | | remove unnecessary require
| * | | | remove unnecessary requireSergey Nartimov2012-05-163-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | - access & filters don't use multibyte ext - transliterate requires only AS::Multibyte but not multibyte ext
* | | | | fix bad formatting [ci skip]Vijay Dev2012-05-171-2/+2
|/ / / /
* / / / fix safe string interpolation with SafeBuffer#%, closes #6352Vasiliy Ermolovich2012-05-162-0/+38
|/ / /
* | | remove backported string interpolationVasiliy Ermolovich2012-05-152-3/+0
| | |
* | | Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-masterAaron Patterson2012-05-152-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 Laine2012-03-242-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/docrailsVijay Dev2012-05-1525-82/+52
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * | | missing dot [ci skip]Vijay Dev2012-05-151-1/+1
| | | |
| * | | adding examples to deep_dup methodFrancesco Rodriguez2012-05-141-1/+23
| | | |
| * | | removing unnecessary 'examples' noise from activesupportFrancesco Rodriguez2012-05-1321-74/+11
| | | |
| * | | Fixing Hash#stringify_keys docsFrancesco Rodriguez2012-05-131-1/+1
| | | |
| * | | marking self in Hash#symbolize_keys!Francesco Rodriguez2012-05-131-1/+1
| | | |
| * | | added example to Hash#symbolize_keysFrancesco Rodriguez2012-05-131-2/+5
| | | |
| * | | unnecessary 'examples' noise in Hash#assert_valid_keys docsFrancesco Rodriguez2012-05-131-1/+0
| | | |
| * | | added example to Hash#stringify_keysFrancesco Rodriguez2012-05-131-1/+5
| | | |
| * | | adding examples to Hash#deep_merge methodFrancesco Rodriguez2012-05-131-2/+7
| | | |
| * | | Update docs to public_send for Object#tryOscar Del Ben2012-05-131-1/+1
| | | |
| * | | update docs on Object#tryVasiliy Ermolovich2012-05-131-1/+1
| | | |
* | | | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵José Valim2012-05-141-1/+1
| | | | | | | | | | | | | | | | AS, closes #6287
* | | | Merge pull request #4431 from lest/refactor-1-9Rafael Mendonça França2012-05-131-7/+3
|\ \ \ \ | | | | | | | | | | use const_defined? with second argument in AS::Dependencies
| * | | | use const_defined? with second argument in AS::DependenciesSergey Nartimov2012-05-131-7/+3
| | | | | | | | | | | | | | | | | | | | there is no need in local_const_defined? helper method
* | | | | Remove dependency on safe_join from number helpersCarlos Antonio da Silva2012-05-131-3/+2
| | | | | | | | | | | | | | | | | | | | Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16.
* | | | | Merge pull request #6305 from arunagw/ruby-prof-fixesCarlos Antonio da Silva2012-05-132-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | Ruby prof fixes