Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Fix deletion of empty directories: | Charles Jones | 2013-02-25 | 3 | -2/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. When comparing the directory to delete against the top level cache_path, use File.realpath to make sure we aren't comparing two unequal strings that point to the same path. This occurs, for example, when cache_path has a trailing slash, which it does in the default Rails configuration. Since the input to delete_empty_directories never has a trailing slash, the comparison will never be true and the top level cache directory (and above) may be deleted. However… 2. File.delete raises EPERM when trying to delete a directory, so no directories have ever been deleted. Changing the code to Dir.delete fixes that. | |||||
* | | We want i18n >= 0.6.2 but < 1.0 | Santiago Pastorino | 2013-02-26 | 1 | -1/+1 | |
| | | ||||||
* | | Update CHANGELOGS | Rafael Mendonça França | 2013-02-26 | 1 | -0/+3 | |
| | | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-02-26 | 1 | -2/+2 | |
|\ \ | |/ |/| | ||||||
| * | Corrected link anchor and added colons for continuity | Doug Yun | 2013-02-19 | 1 | -2/+2 | |
| | | ||||||
* | | Bump i18n version to 0.6.2 | Guillermo Iguaran | 2013-02-25 | 1 | -1/+1 | |
| | | ||||||
* | | Preparing for 4.0.0.beta1 release | David Heinemeier Hansson | 2013-02-25 | 2 | -2/+2 | |
| | | ||||||
* | | Keep second fraction when DateTime#change is called. | Chris Baynes | 2013-02-25 | 3 | -1/+9 | |
| | | ||||||
* | | Revert "Simplify code in AS json encoder" | Guillermo Iguaran | 2013-02-25 | 1 | -8/+15 | |
| | | | | | | | | | | | | This reverts commit 046e27a7338f2961c10e9d133e0e2229b51c2ba8. Check https://github.com/rails/rails/pull/8815#issuecomment-14026122 for details. | |||||
* | | Merge pull request #8815 from bogdan/simplified-to-json-args | Steve Klabnik | 2013-02-24 | 1 | -15/+8 | |
|\ \ | | | | | | | AS JSON encoder: remove monkey patch of Array | |||||
| * | | Simplify code in AS json encoder | Bogdan Gusiev | 2013-01-06 | 1 | -15/+8 | |
| | | | ||||||
* | | | Add more information to the CHANGELOG entry [ci skip] | Rafael Mendonça França | 2013-02-24 | 1 | -0/+12 | |
| | | | ||||||
* | | | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility. | stopdropandrew | 2013-02-24 | 3 | -0/+19 | |
| | | | ||||||
* | | | did a pass over the AS changelog [ci skip] | Xavier Noria | 2013-02-24 | 1 | -55/+61 | |
| | | | ||||||
* | | | Revert "prevent minitest from printing a --seed run option" | Xavier Noria | 2013-02-24 | 1 | -12/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: on a second thought, minitest prints a seed as run option regardless of the test order, and it actually calls srand, so albeit it might be misleading I believe, it is the way it is and should be left that way. This reverts commit c15862ae0cb876d745609170f0f90a9bb9b5e0ae. | |||||
* | | | prevent minitest from printing a --seed run option | Xavier Noria | 2013-02-24 | 1 | -2/+12 | |
| | | | | | | | | | | | | See the first FIXME comment in the patch for the rationale. | |||||
* | | | Move number_to_human test from AP to AS | Carlos Antonio da Silva | 2013-02-22 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | Since all changes from #9347 are related to AS, it seems proper that the test is placed there as well. | |||||
* | | | Changelog improvements, use 1.9 style hash in examples [ci skip] | Carlos Antonio da Silva | 2013-02-22 | 1 | -13/+12 | |
| | | | ||||||
* | | | Merge pull request #9347 from hoffm/number_to_human_bug | Steve Klabnik | 2013-02-22 | 2 | -1/+14 | |
|\ \ \ | | | | | | | | | Address edge case for number_to_human with units option. | |||||
| * | | | Address edge case for number_to_human with units option. | hoffm | 2013-02-22 | 2 | -1/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when the units hash does not contain the needed key, e.g. when the number provided is less than the largest key provided. | |||||
* | | | | Correct comment for (beginning|end)_of_minute | Gert Goet | 2013-02-22 | 2 | -4/+4 | |
|/ / / | ||||||
* | | | Added beginning_of_minute support to core_ext calculations for Time and DateTime | Gagan Awhad | 2013-02-21 | 6 | -0/+61 | |
| | | | ||||||
* | | | moves the new :nsec date format to the Active Support changelog [ci skip] | Xavier Noria | 2013-02-20 | 1 | -0/+4 | |
| | | | ||||||
* | | | Bump up minitest dependency and remove our own reinvented version of ↵ | Akira Matsuda | 2013-02-19 | 2 | -38/+2 | |
| |/ |/| | | | | | ParallelEach | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-02-15 | 1 | -2/+2 | |
|\ \ | | | | | | | | | | | | | Conflicts: guides/source/upgrading_ruby_on_rails.md | |||||
| * | | Change Class#subclasses doc example | Dalibor Nasevic | 2013-02-06 | 1 | -2/+2 | |
| | | | ||||||
* | | | Supress warning about method redifinition | Ryunosuke SATO | 2013-02-11 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In i18n gem, the following methods are defined. - `Hash#except` - `Hash#slice` But if there are defined already, i18n skips these definitions. So these definition by `active_support` are required before `require 'i18n'`. | |||||
* | | | Merge pull request #9238 from norman/unicode_62 | Carlos Antonio da Silva | 2013-02-10 | 2 | -1/+1 | |
|\ \ \ | | | | | | | | | Update to latest Unicode data. | |||||
| * | | | Update to latest Unicode data. | Norman Clarke | 2013-02-10 | 2 | -1/+1 | |
| |/ / | | | | | | | | | | Release notes at: http://www.unicode.org/versions/Unicode6.2.0/ | |||||
* | | | Merge pull request #8643 from tricknotes/remove-method-redefined-warning | Andrew White | 2013-02-10 | 1 | -0/+1 | |
|\ \ \ | | | | | | | | | Remove method redefined warning | |||||
| * | | | Remove method redefined warning | Ryunosuke SATO | 2013-02-11 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `i18n` gem, the method definition of `Hash#deep_merge!` is skipped when it is already defined. - warning: method redefined; discarding old deep_merge! | |||||
* | | | | added compress options for gzip | Beyond | 2013-02-10 | 3 | -2/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | added test for compress options of gzip update changelog | |||||
* | | | | Update changelog from #9128 with author name | Carlos Antonio da Silva | 2013-02-06 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | And improve AS changelog a bit [ci skip] | |||||
* | | | | Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracy | Jeremy Kemper | 2013-02-06 | 3 | -2/+7 | |
|\ \ \ \ | |_|/ / |/| | | | Modify TimeWithZone#as_json to return 3DP of sub-second accuracy. | |||||
| * | | | Modify TimeWithZone#as_json to return 3DP of sub-second accuracy by default, ↵ | James Harton | 2013-01-31 | 3 | -2/+7 | |
| | | | | | | | | | | | | | | | | since it's allowed by the spec and is very useful. | |||||
* | | | | Missing require extract_options | Akira Matsuda | 2013-01-31 | 3 | -0/+3 | |
|/ / / | ||||||
* | | | 'minitest/parallel_each' might not always be available | Akira Matsuda + Koichi Sasada | 2013-01-29 | 1 | -1/+4 | |
| | | | ||||||
* | | | Needs to explicitly require 'minitest/parallel_each' | Akira Matsuda + Koichi Sasada | 2013-01-29 | 1 | -0/+2 | |
| | | | | | | | | | | | | Minitest has changed to require this since https://github.com/seattlerb/minitest/commit/728054b | |||||
* | | | revamps the RDoc of Object#try | Xavier Noria | 2013-01-28 | 1 | -22/+30 | |
| | | | ||||||
* | | | Move AS changelog entry to the top, improve AP changelog a bit | Carlos Antonio da Silva | 2013-01-28 | 1 | -2/+2 | |
| | | | | | | | | | | | | [ci skip] | |||||
* | | | no need for \Z, \z is more concise | Xavier Noria | 2013-01-28 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #8830 from antoinelyset/master | Xavier Noria | 2013-01-28 | 3 | -5/+11 | |
|\ \ \ | | | | | | | | | Improve String#squish whitespaces matching | |||||
| * | | | Improve String#squish whitespaces matching | Antoine Lyset | 2013-01-22 | 3 | -5/+11 | |
| | | | | ||||||
* | | | | Use Encoding::UTF_8 constant :do_not_litter: | Akira Matsuda | 2013-01-28 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Use already defined Encoding constants rather than creating one-trip Strings | Akira Matsuda | 2013-01-28 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge remote-tracking branch 'docrails/master' | Xavier Noria | 2013-01-26 | 2 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb guides/code/getting_started/app/controllers/comments_controller.rb | |||||
| * | | | | fix reference to ActiveSupport::ProxyObject | Matt Bridges | 2013-01-13 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Clarified the minute option on DateTime#change | Jakob Waller | 2013-01-10 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Set Thread.abort_on_exception for the whole AS, AP, and AR tests | Akira Matsuda + Koichi Sasada | 2013-01-24 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | this would give us some more clues in case a test silently dies inside Thread | |||||
* | | | | | Fix some wrong String extensions tests | Akira Matsuda | 2013-01-23 | 1 | -7/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ASCII_STRING was not an ASCII String * BYTE_STRING was not an in valid UTF-8 String * added an assertion for non-UTF-8 String |