Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4496 from makeable/master | Aaron Patterson | 2012-05-03 | 1 | -1/+1 |
|\ | |||||
| * | race_condition_ttl should be an integer | Matt Williams | 2012-01-17 | 1 | -1/+1 |
* | | BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ... | David FRANCOIS | 2012-05-02 | 1 | -1/+14 |
* | | Merge pull request #6096 from hasclass/as_json__encode_infinite_and_nan_bigde... | Piotr Sarnacki | 2012-05-01 | 1 | -1/+3 |
|\ \ | |||||
| * | | JSON: encode BigDecimal NaN/Infinity as null. | Sebi Burkhard | 2012-05-01 | 1 | -1/+3 |
* | | | 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 | 22 | -75/+127 |
| |\ \ | |||||
| | * | | 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 hasclass/as_json__encode_infinite_and_nan_float... | Piotr Sarnacki | 2012-04-30 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | JSON: Encode infinite or NaN floats as null to generate valid JSON. | Sebi Burkhard | 2011-08-15 | 1 | -0/+4 |
* | | | | | Merge pull request #5838 from IamNaN/patch-1 | Andrew White | 2012-04-30 | 1 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. Fu... | Dave Gerton | 2012-04-13 | 1 | -2/+4 |
* | | | | | | Merge pull request #5177 from cap10morgan/fix-gh-issue-4374 | José Valim | 2012-04-30 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix inflector bug where -ice gets pluralized into -ouse | Wes Morgan | 2012-02-25 | 1 | -4/+4 |
* | | | | | | | Merge pull request #6074 from mark-rushakoff/unused-variables | Jeremy Kemper | 2012-04-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unused assignments | Mark Rushakoff | 2012-04-29 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #5999 from bogdan/callbacks | Jeremy Kemper | 2012-04-29 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | AS::Callbacks optimized to reduce call backtrace | Bogdan Gusiev | 2012-04-27 | 1 | -7/+7 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #6044 from gazay/tests_for_string_truncate_w_regexp_separator | José Valim | 2012-04-29 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Tests for regexp separator in String#truncate | Alexey Gaziev | 2012-04-29 | 1 | -1/+4 |
* | | | | | | | | Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silence | José Valim | 2012-04-29 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Document #behavior= and update CHANGELOG | twinturbo | 2012-04-28 | 1 | -0/+7 |
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | 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 |
| * | | | | | | 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 |
* | | | | | | | Merge pull request #5880 from asanghi/master | Jeremy Kemper | 2012-04-25 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | and one more time | Aditya Sanghi | 2012-04-24 | 1 | -2/+2 |
| * | | | | | | another attempt at the language | Aditya Sanghi | 2012-04-18 | 1 | -1/+1 |
| * | | | | | | review changes for #5875 | Aditya Sanghi | 2012-04-18 | 1 | -1/+1 |
| * | | | | | | stamp out ruby-debug19 with extreme prejudice :) | Aditya Sanghi | 2012-04-17 | 1 | -2/+2 |
* | | | | | | | Remove circular require of time/zones | Oscar Del Ben | 2012-04-21 | 1 | -1/+0 |
* | | | | | | | Remove unused code. We should use 'active_support/time'. | kennyj | 2012-04-19 | 1 | -5/+0 |
* | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-18 | 1 | -5/+32 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add documentation to detail passing of an object as the second | Michael de Silva | 2012-04-13 | 1 | -0/+27 |
| * | | | | | | Fix further typos in ActiveSupport::Notifications | Michael de Silva | 2012-04-13 | 1 | -4/+4 |
| * | | | | | | Fix rdoc typo in ActiveSupport::Notifications | Michael de Silva | 2012-04-13 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | fixed broken build after multi_json upgrade | Arun Agrawal | 2012-04-16 | 1 | -3/+3 |
* | | | | | | Require for time_with_zone should stay in core_ext/time_zones :bomb: | Piotr Sarnacki | 2012-04-15 | 1 | -0/+1 |
* | | | | | | Add missing require in Active Support time zones (fixes #5854) | Piotr Sarnacki | 2012-04-15 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fix doc for ActiveSupport::Callbacks::Callback#define_conditional_callback | Jan Xie | 2012-04-08 | 1 | -1/+1 |