aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5500 from panthomakos/load-allMichael Koziarski2012-05-072-18/+1
|\
| * Removed ActiveSupport#load_all!Pan Thomakos2012-03-182-18/+1
* | Merge pull request #6064 from gazay/fix_guides_for_as_core_extXavier Noria2012-05-072-3/+15
|\ \
| * | Changes for numeric api for Time because Time.current works differentAlexey Gaziev2012-05-071-3/+3
| * | Added tests for comparsion operator for RangeAlexey Gaziev2012-05-071-0/+12
* | | Keep all methods in object/deep_dupPiotr Sarnacki2012-05-066-18/+17
* | | Updated CHANGELOG entry for `deep_dup`Piotr Sarnacki2012-05-061-0/+2
* | | Nice logic for deep_dup in railsAlexey Gaziev2012-05-067-19/+70
* | | Merge pull request #6169 from marcandre/respond_to_missingJosé Valim2012-05-056-6/+24
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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 t...Mark J. Titorenko2012-05-041-8/+8
|/ / / /
* | | | Merge pull request #4452 from tapajos/e5425c8f68fbb720fcbf4b14e1f154ac27dbbbedAaron Patterson2012-05-032-1/+8
|\ \ \ \
| * | | | Cache (FileStore) clear should keep .gitkeepMarcos Tapajos2012-01-132-1/+8
* | | | | Merge pull request #4496 from makeable/masterAaron Patterson2012-05-031-1/+1
|\ \ \ \ \
| * | | | | 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
* | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |