aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-05-181-0/+1
|\
| * Increase `AR#cache_key` precision to nanosecondsJamie Gaskins2012-05-191-0/+1
* | Merge pull request #6183 from nashby/fix-issue-6179Jeremy Kemper2012-05-182-7/+16
|\ \
| * | respect nsec in TimeWithZoneVasiliy Ermolovich + Sergey Nartimov2012-05-182-5/+5
| * | wrap time ranges with timezones, closes #6179Vasiliy Ermolovich2012-05-171-2/+11
* | | reverting decoupling of NumberHelper from safe_join and adding tests for esca...Andrew Mutz2012-05-181-0/+1
* | | doesn't modify params in SafeBuffer#%Vasiliy Ermolovich2012-05-181-3/+1
| |/ |/|
* | 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 performanceBogdan Gusiev2012-05-161-16/+3
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-172-9/+12
|\ \ \
| * | | 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 statementBogdan Gusiev2012-05-171-2/+2
| | |/ / | |/| |
* | | | Merge pull request #6361 from markmcspadden/issue_6265José Valim2012-05-171-24/+0
|\ \ \ \
| * | | | Remove special cases for duplicable? on Class and ModuleMark McSpadden2012-05-171-24/+0
* | | | | Ensure blocks given to subscriber are properly yieldJosé Valim2012-05-171-4/+5
* | | | | Merge pull request #6356 from andhapp/fix-bug-with-inflectionsJosé Valim2012-05-161-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix an issue with inflection where my_analyses (in plular form) incorrectly c...Anuj Dutta2012-05-161-1/+1
* | | | | 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
* | | | Merge pull request #6354 from lest/patch-1Rafael Mendonça França2012-05-163-5/+1
|\ \ \ \
| * | | | remove unnecessary requireSergey Nartimov2012-05-163-5/+1
* | | | | fix bad formatting [ci skip]Vijay Dev2012-05-171-2/+2
|/ / / /
* / / / fix safe string interpolation with SafeBuffer#%, closes #6352Vasiliy Ermolovich2012-05-161-0/+14
|/ / /
* | | remove backported string interpolationVasiliy Ermolovich2012-05-152-3/+0
* | | Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-masterAaron Patterson2012-05-151-0/+5
|\ \ \ | |/ / |/| |
| * | [#5559] Do not black out the system timezone DST jump hour if Time.zone diffe...Jarkko Laine2012-03-241-0/+5
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-1525-82/+52
|\ \ \
| * | | 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 A...José Valim2012-05-141-1/+1
* | | | 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::DependenciesSergey Nartimov2012-05-131-7/+3
* | | | | Remove dependency on safe_join from number helpersCarlos Antonio da Silva2012-05-131-3/+2
* | | | | Merge pull request #6305 from arunagw/ruby-prof-fixesCarlos Antonio da Silva2012-05-132-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Need to include "OutputSaftyHelper" here to preventArun Agrawal2012-05-131-0/+1