aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6169 from marcandre/respond_to_missingJosé Valim2012-05-056-6/+24
|\ | | | | Respond to missing
| * Use respond_to_missing for TimeWithZoneMarc-Andre Lafortune2012-05-052-3/+4
| |
| * Use respond_to_missing? for CharsMarc-Andre Lafortune2012-05-052-2/+11
| |
| * Use respond_to_missing? for OrderedOptionsMarc-Andre Lafortune2012-05-052-1/+9
| |
* | Merge pull request #6156 from mjtko/feature-beginning_of_hourJeremy Kemper2012-05-045-0/+56
|\ \ | | | | | | Beginning and end of hour support for Time and DateTime
| * | added beginning_of_hour support to core_ext calculations for Time and DateTimeMark J. Titorenko2012-05-045-0/+56
| | |
* | | enable tests for beginning_of_* and end_of_* within time zone tests; enable ↵Mark J. Titorenko2012-05-041-8/+8
|/ / | | | | | | test for future_with_time_current_as_time_with_zone; fix beginning_of_month test.
* | Merge pull request #4452 from tapajos/e5425c8f68fbb720fcbf4b14e1f154ac27dbbbedAaron Patterson2012-05-032-1/+8
|\ \ | | | | | | Fix cache (FileStore) clear to keep .gitkeep.
| * | Cache (FileStore) clear should keep .gitkeepMarcos Tapajos2012-01-132-1/+8
| | |
* | | Merge pull request #4496 from makeable/masterAaron Patterson2012-05-031-1/+1
|\ \ \ | | | | | | | | Active Support Cache - race_condition_ttl should be an integer
| * | | race_condition_ttl should be an integerMatt Williams2012-01-171-1/+1
| | | |
* | | | 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
| | | | | | | | | | | | | | | | #6033
* | | | Merge pull request #6096 from ↵Piotr Sarnacki2012-05-012-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | hasclass/as_json__encode_infinite_and_nan_bigdecimals_as_null JSON: encode BigDecimal NaN/Infinity as null.
| * | | | 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 ↵Piotr Sarnacki2012-04-302-0/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | hasclass/as_json__encode_infinite_and_nan_floats_as_null JSON: Encode infinite or NaN floats as `null` to generate valid JSON.
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | 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
| | | | | | | |