aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5838 from IamNaN/patch-1Andrew White2012-04-301-2/+4
|\ | | | | Incorporating Pacific Island zone changes circa Dec 31 2011
| * Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. ↵Dave Gerton2012-04-131-2/+4
| | | | | | | | Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011 switching from UTC-11 to UTC+13. American Samoa did not make the change and remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and documentation about the dateline change is in austalasia at IANA.
* | Improve changelog of new :silence deprecation behaviorCarlos Antonio da Silva2012-04-301-1/+1
| |
* | Update activesupport/CHANGELOG.mdJosé Valim2012-04-301-0/+2
| |
* | Merge pull request #5177 from cap10morgan/fix-gh-issue-4374José Valim2012-04-302-5/+7
|\ \ | | | | | | fix inflector bug where -ice gets singularized into -ouse
| * | fix inflector bug where -ice gets pluralized into -ouseWes Morgan2012-02-252-5/+7
| | | | | | | | | | | | This should happen for mouse or louse, but not slice or pumice.
* | | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-1/+1
|\ \ \ | | | | | | | | Remove some unused variable assignments
| * | | Remove unused assignmentsMark Rushakoff2012-04-291-1/+1
| | | |
* | | | Merge pull request #6067 from Locke23rus/patch-2Aaron Patterson2012-04-291-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo
| * | | | Fix typoKirill Nikitin2012-04-301-1/+1
| | | | |
* | | | | Merge pull request #5999 from bogdan/callbacksJeremy Kemper2012-04-291-7/+7
|\ \ \ \ \ | |/ / / / |/| | | | AS::Callbacks#run_callbacks optimized to reduce backtrace
| * | | | AS::Callbacks optimized to reduce call backtraceBogdan Gusiev2012-04-271-7/+7
| | | | |
* | | | | Remove repeated wordKirill Nikitin2012-04-301-1/+1
| |/ / / |/| | |
* | | | Merge pull request #6044 from gazay/tests_for_string_truncate_w_regexp_separatorJosé Valim2012-04-292-1/+10
|\ \ \ \ | | | | | | | | | | Tests for regexp separator in String#truncate
| * | | | Tests for regexp separator in String#truncateAlexey Gaziev2012-04-292-1/+10
| | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/5a7513593f64e0ff7e4de1ee37bac5eeddfae270
* | | | | Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silenceJosé Valim2012-04-293-2/+32
|\ \ \ \ \ | |/ / / / |/| | | | Add a "silence" behavior to completely turn off deprecation warnings.
| * | | | Add test for default silence and stderr deprecation behaviorsCarlos Antonio da Silva2012-04-281-0/+20
| | | | |
| * | | | Document #behavior= and update CHANGELOGtwinturbo2012-04-282-0/+9
| | | | |
| * | | | Add a "silence" behavior to completely turn off deprecation warnings.Adam Hawkins2012-04-281-2/+3
| |/ / /
* | | | Merge pull request #5996 from gazay/remove_excess_selfsJeremy Kemper2012-04-2841-324/+473
|\ \ \ \ | |/ / / |/| | | Active Support housekeeping and polish
| * | | String quotes and trailing spacesAlexey Gaziev2012-04-2921-126/+126
| | | |
| * | | Indentation for private methodsAlexey Gaziev2012-04-292-20/+18
| | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/e7d55f734aae204115d0a04a2db774ac364c1312
| * | | AS core_ext refactoring pt.2Alexey Gaziev2012-04-2920-86/+110
| | | |
| * | | AS core_ext refactoringAlexey Gaziev2012-04-2915-93/+220
| | | |
* | | | Merge pull request #5880 from asanghi/masterJeremy Kemper2012-04-251-2/+2
|\ \ \ \ | |/ / / |/| | | Stamp out ruby-debug with debugger everywhere else in the code base
| * | | and one more timeAditya Sanghi2012-04-241-2/+2
| | | |
| * | | another attempt at the languageAditya Sanghi2012-04-181-1/+1
| | | |
| * | | review changes for #5875Aditya Sanghi2012-04-181-1/+1
| | | |
| * | | stamp out ruby-debug19 with extreme prejudice :)Aditya Sanghi2012-04-171-2/+2
| | | |
* | | | Remove circular require of time/zonesOscar Del Ben2012-04-211-1/+0
| | | |
* | | | Remove unused code. We should use 'active_support/time'.kennyj2012-04-191-5/+0
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-181-5/+32
|\ \ \ \
| * | | | Add documentation to detail passing of an object as the secondMichael de Silva2012-04-131-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter passed to the ActiveSupport::Notifications.subscribe method instead of a block Example code sample and output is provided as well.
| * | | | Fix further typos in ActiveSupport::NotificationsMichael de Silva2012-04-131-4/+4
| | | | |
| * | | | Fix rdoc typo in ActiveSupport::NotificationsMichael de Silva2012-04-131-1/+1
| | |_|/ | |/| |
* | | | Revert "Merge pull request #5864 from vatrai/remove_ordered_hash_autoload"Aaron Patterson2012-04-171-0/+1
| |/ / |/| | | | | | | | | | | This reverts commit 86c640a1625aa3a8ec8728c2f1c640c9718fcb0b, reversing changes made to a0c2cfdc51e16fc39c1d3b1e78bdd257188fa04e.
* | | remove autoload for OrderedHash, usages removed alreadyVishnu Atrai2012-04-161-1/+0
| | |
* | | Relax multi_json dependency to allow any 1.3 -> 1.x instead of just 1.3.xJeremy Kemper2012-04-161-1/+1
| | |
* | | fixed broken build after multi_json upgradeArun Agrawal2012-04-162-4/+4
| | | | | | | | | Multi_json also upgraded.
* | | Require for time_with_zone should stay in core_ext/time_zones :bomb:Piotr Sarnacki2012-04-151-0/+1
| | |
* | | Add missing require in Active Support time zones (fixes #5854)Piotr Sarnacki2012-04-151-1/+1
|/ / | | | | | | | | I also removed the other require as it's already present in `activesupport/core_ext/time/calculations`
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-121-1/+1
|\ \
| * | fix doc for ActiveSupport::Callbacks::Callback#define_conditional_callbackJan Xie2012-04-081-1/+1
| | |
* | | Add changelog entryDaniel Schierbeck2012-04-121-0/+2
| | |
* | | Remove Module#delegate!Daniel Schierbeck2012-04-121-52/+0
| | |
* | | Add back the old `deprecate` method as `deprecate!`Daniel Schierbeck2012-04-121-0/+52
| | |
* | | Change API docs regarding delegation to non-public methodsDaniel Schierbeck2012-04-121-1/+1
| | |
* | | Optimize the performance of #delegateDaniel Schierbeck2012-04-122-9/+32
| | | | | | | | | | | | | | | | | | Remove the use of #__send__ in order to boost performance. This also means that you can no longer delegate to private methods on the target object.
* | | Inline the symbolize_keys/stringify_keys methodsSantiago Pastorino2012-04-081-2/+10
| | | | | | | | | | | | | | | | | | user system total real symbolize_keys 5.980000 0.070000 6.050000 ( 6.048187) new_symbolize_keys 4.310000 0.050000 4.360000 ( 4.364745)
* | | Remove Fixnum#to_sym support in 1.8.7Santiago Pastorino2012-04-081-1/+1
| | |