aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* Rakefile executable attributes and shebang lines has been removedRoman V. Babenko2012-05-021-0/+0
* BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ...David FRANCOIS2012-05-023-1/+28
* Merge pull request #6096 from hasclass/as_json__encode_infinite_and_nan_bigde...Piotr Sarnacki2012-05-012-1/+4
|\
| * JSON: encode BigDecimal NaN/Infinity as null.Sebi Burkhard2012-05-012-1/+4
* | more edits [ci skip]Vijay Dev2012-05-011-1/+1
* | copy edit AS deprecation/behaviours docs [ci skip]Vijay Dev2012-05-011-22/+11
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-015-3/+23
|\ \ | |/ |/|
| * Add documention for utc_offset methodRob Zolkos2012-05-011-0/+1
| * Minor English fix.Erich Menge2012-04-301-1/+1
| * Document ActiveSupport::Deprecations.behaviortwinturbo2012-04-291-1/+19
| * Merge branch 'master' of github.com:lifo/docrailstwinturbo2012-04-2831-93/+206
| |\
| | * fix typo in ActiveSupport::Inflector#titleizeFrancesco Rodriguez2012-04-281-1/+1
| * | Document exception handling inside resce_from handlerstwinturbo2012-04-281-0/+1
* | | Merge pull request #2532 from hasclass/as_json__encode_infinite_and_nan_float...Piotr Sarnacki2012-04-302-0/+7
|\ \ \
| * | | JSON: Encode infinite or NaN floats as null to generate valid JSON.Sebi Burkhard2011-08-152-0/+7
* | | | Merge pull request #5838 from IamNaN/patch-1Andrew White2012-04-301-2/+4
|\ \ \ \
| * | | | Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. Fu...Dave Gerton2012-04-131-2/+4
* | | | | 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 pluralized into -ouseWes Morgan2012-02-252-5/+7
* | | | | | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-1/+1
|\ \ \ \ \ \
| * | | | | | Remove unused assignmentsMark Rushakoff2012-04-291-1/+1
* | | | | | | Merge pull request #6067 from Locke23rus/patch-2Aaron Patterson2012-04-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typoKirill Nikitin2012-04-301-1/+1
* | | | | | | | Merge pull request #5999 from bogdan/callbacksJeremy Kemper2012-04-291-7/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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#truncateAlexey Gaziev2012-04-292-1/+10
* | | | | | | Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silenceJosé Valim2012-04-293-2/+32
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | String quotes and trailing spacesAlexey Gaziev2012-04-2921-126/+126
| * | | | | Indentation for private methodsAlexey Gaziev2012-04-292-20/+18
| * | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
| * | | | | | Fix further typos in ActiveSupport::NotificationsMichael de Silva2012-04-131-4/+4
| * | | | | | Fix rdoc typo in ActiveSupport::NotificationsMichael de Silva2012-04-131-1/+1
| | |_|/ / / | |/| | | |