Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6169 from marcandre/respond_to_missing | José Valim | 2012-05-05 | 6 | -6/+24 |
|\ | | | | | Respond to missing | ||||
| * | Use respond_to_missing for TimeWithZone | Marc-Andre Lafortune | 2012-05-05 | 2 | -3/+4 |
| | | |||||
| * | Use respond_to_missing? for Chars | Marc-Andre Lafortune | 2012-05-05 | 2 | -2/+11 |
| | | |||||
| * | Use respond_to_missing? for OrderedOptions | Marc-Andre Lafortune | 2012-05-05 | 2 | -1/+9 |
| | | |||||
* | | Merge pull request #6156 from mjtko/feature-beginning_of_hour | Jeremy Kemper | 2012-05-04 | 5 | -0/+56 |
|\ \ | | | | | | | Beginning and end of hour support for Time and DateTime | ||||
| * | | added beginning_of_hour support to core_ext calculations for Time and DateTime | Mark J. Titorenko | 2012-05-04 | 5 | -0/+56 |
| | | | |||||
* | | | enable tests for beginning_of_* and end_of_* within time zone tests; enable ↵ | Mark J. Titorenko | 2012-05-04 | 1 | -8/+8 |
|/ / | | | | | | | test for future_with_time_current_as_time_with_zone; fix beginning_of_month test. | ||||
* | | Merge pull request #4452 from tapajos/e5425c8f68fbb720fcbf4b14e1f154ac27dbbbed | Aaron Patterson | 2012-05-03 | 2 | -1/+8 |
|\ \ | | | | | | | Fix cache (FileStore) clear to keep .gitkeep. | ||||
| * | | Cache (FileStore) clear should keep .gitkeep | Marcos Tapajos | 2012-01-13 | 2 | -1/+8 |
| | | | |||||
* | | | Merge pull request #4496 from makeable/master | Aaron Patterson | 2012-05-03 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Active Support Cache - race_condition_ttl should be an integer | ||||
| * | | | race_condition_ttl should be an integer | Matt Williams | 2012-01-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Rakefile executable attributes and shebang lines has been removed | Roman V. Babenko | 2012-05-02 | 1 | -0/+0 |
| | | | | |||||
* | | | | BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ↵ | David FRANCOIS | 2012-05-02 | 3 | -1/+28 |
| | | | | | | | | | | | | | | | | #6033 | ||||
* | | | | Merge pull request #6096 from ↵ | Piotr Sarnacki | 2012-05-01 | 2 | -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 Burkhard | 2012-05-01 | 2 | -1/+4 |
| | | | | | |||||
* | | | | | more edits [ci skip] | Vijay Dev | 2012-05-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | copy edit AS deprecation/behaviours docs [ci skip] | Vijay Dev | 2012-05-01 | 1 | -22/+11 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-01 | 5 | -3/+23 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add documention for utc_offset method | Rob Zolkos | 2012-05-01 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Minor English fix. | Erich Menge | 2012-04-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Document ActiveSupport::Deprecations.behavior | twinturbo | 2012-04-29 | 1 | -1/+19 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | twinturbo | 2012-04-28 | 31 | -93/+206 |
| |\ \ \ \ | |||||
| | * | | | | fix typo in ActiveSupport::Inflector#titleize | Francesco Rodriguez | 2012-04-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Document exception handling inside resce_from handlers | twinturbo | 2012-04-28 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #2532 from ↵ | Piotr Sarnacki | 2012-04-30 | 2 | -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 Burkhard | 2011-08-15 | 2 | -0/+7 |
| | | | | | | |||||
* | | | | | | Merge pull request #5838 from IamNaN/patch-1 | Andrew White | 2012-04-30 | 1 | -2/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Incorporating Pacific Island zone changes circa Dec 31 2011 | ||||
| * | | | | | | Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. ↵ | Dave Gerton | 2012-04-13 | 1 | -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 behavior | Carlos Antonio da Silva | 2012-04-30 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Update activesupport/CHANGELOG.md | José Valim | 2012-04-30 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #5177 from cap10morgan/fix-gh-issue-4374 | José Valim | 2012-04-30 | 2 | -5/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix inflector bug where -ice gets singularized into -ouse | ||||
| * | | | | | | | fix inflector bug where -ice gets pluralized into -ouse | Wes Morgan | 2012-02-25 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should happen for mouse or louse, but not slice or pumice. | ||||
* | | | | | | | | Merge pull request #6074 from mark-rushakoff/unused-variables | Jeremy Kemper | 2012-04-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove some unused variable assignments | ||||
| * | | | | | | | | Remove unused assignments | Mark Rushakoff | 2012-04-29 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #6067 from Locke23rus/patch-2 | Aaron Patterson | 2012-04-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix typo | ||||
| * | | | | | | | | | Fix typo | Kirill Nikitin | 2012-04-30 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5999 from bogdan/callbacks | Jeremy Kemper | 2012-04-29 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | AS::Callbacks#run_callbacks optimized to reduce backtrace | ||||
| * | | | | | | | | | AS::Callbacks optimized to reduce call backtrace | Bogdan Gusiev | 2012-04-27 | 1 | -7/+7 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Remove repeated word | Kirill Nikitin | 2012-04-30 | 1 | -1/+1 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #6044 from gazay/tests_for_string_truncate_w_regexp_separator | José Valim | 2012-04-29 | 2 | -1/+10 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Tests for regexp separator in String#truncate | ||||
| * | | | | | | | | Tests for regexp separator in String#truncate | Alexey Gaziev | 2012-04-29 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/5a7513593f64e0ff7e4de1ee37bac5eeddfae270 | ||||
* | | | | | | | | | Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silence | José Valim | 2012-04-29 | 3 | -2/+32 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Add a "silence" behavior to completely turn off deprecation warnings. | ||||
| * | | | | | | | | Add test for default silence and stderr deprecation behaviors | Carlos Antonio da Silva | 2012-04-28 | 1 | -0/+20 |
| | | | | | | | | | |||||
| * | | | | | | | | Document #behavior= and update CHANGELOG | twinturbo | 2012-04-28 | 2 | -0/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Add a "silence" behavior to completely turn off deprecation warnings. | Adam Hawkins | 2012-04-28 | 1 | -2/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #5996 from gazay/remove_excess_selfs | Jeremy Kemper | 2012-04-28 | 41 | -324/+473 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Active Support housekeeping and polish | ||||
| * | | | | | | | String quotes and trailing spaces | Alexey Gaziev | 2012-04-29 | 21 | -126/+126 |
| | | | | | | | | |||||
| * | | | | | | | Indentation for private methods | Alexey Gaziev | 2012-04-29 | 2 | -20/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/e7d55f734aae204115d0a04a2db774ac364c1312 | ||||
| * | | | | | | | AS core_ext refactoring pt.2 | Alexey Gaziev | 2012-04-29 | 20 | -86/+110 |
| | | | | | | | | |||||
| * | | | | | | | AS core_ext refactoring | Alexey Gaziev | 2012-04-29 | 15 | -93/+220 |
| | | | | | | | |