aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Call String#gsub with Hash directlyAman Gupta2013-03-041-2/+2
|
* only calculate next_id when we need a new method definedAaron Patterson2013-03-041-1/+2
|
* Enforce i18n version >= v0.6.4Carlos Antonio da Silva2013-02-271-1/+1
| | | | Keep in sync with 3-2-stable.
* Move AS CHANGELOG entry up.Steve Klabnik2013-02-261-2/+3
| | | | I merged b883706 but forgot to move the entry past beta1.
* Merge pull request #9329 from chuckbjones/fix-cache-delete-rcSteve Klabnik2013-02-263-2/+16
|\ | | | | Fix deletion of empty directories
| * Fix deletion of empty directories:Charles Jones2013-02-253-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.0Santiago Pastorino2013-02-261-1/+1
| |
* | Update CHANGELOGSRafael Mendonça França2013-02-261-0/+3
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-261-2/+2
|\ \ | |/ |/|
| * Corrected link anchor and added colons for continuityDoug Yun2013-02-191-2/+2
| |
* | Bump i18n version to 0.6.2Guillermo Iguaran2013-02-251-1/+1
| |
* | Preparing for 4.0.0.beta1 releaseDavid Heinemeier Hansson2013-02-252-2/+2
| |
* | Keep second fraction when DateTime#change is called.Chris Baynes2013-02-253-1/+9
| |
* | Revert "Simplify code in AS json encoder"Guillermo Iguaran2013-02-251-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-argsSteve Klabnik2013-02-241-15/+8
|\ \ | | | | | | AS JSON encoder: remove monkey patch of Array
| * | Simplify code in AS json encoderBogdan Gusiev2013-01-061-15/+8
| | |
* | | Add more information to the CHANGELOG entry [ci skip]Rafael Mendonça França2013-02-241-0/+12
| | |
* | | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility.stopdropandrew2013-02-243-0/+19
| | |
* | | did a pass over the AS changelog [ci skip]Xavier Noria2013-02-241-55/+61
| | |
* | | Revert "prevent minitest from printing a --seed run option"Xavier Noria2013-02-241-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 optionXavier Noria2013-02-241-2/+12
| | | | | | | | | | | | See the first FIXME comment in the patch for the rationale.
* | | Move number_to_human test from AP to ASCarlos Antonio da Silva2013-02-221-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 Silva2013-02-221-13/+12
| | |
* | | Merge pull request #9347 from hoffm/number_to_human_bugSteve Klabnik2013-02-222-1/+14
|\ \ \ | | | | | | | | Address edge case for number_to_human with units option.
| * | | Address edge case for number_to_human with units option.hoffm2013-02-222-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_minuteGert Goet2013-02-222-4/+4
|/ / /
* | | Added beginning_of_minute support to core_ext calculations for Time and DateTimeGagan Awhad2013-02-216-0/+61
| | |
* | | moves the new :nsec date format to the Active Support changelog [ci skip]Xavier Noria2013-02-201-0/+4
| | |
* | | Bump up minitest dependency and remove our own reinvented version of ↵Akira Matsuda2013-02-192-38/+2
| |/ |/| | | | | ParallelEach
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-151-2/+2
|\ \ | | | | | | | | | | | | Conflicts: guides/source/upgrading_ruby_on_rails.md
| * | Change Class#subclasses doc exampleDalibor Nasevic2013-02-061-2/+2
| | |
* | | Supress warning about method redifinitionRyunosuke SATO2013-02-111-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_62Carlos Antonio da Silva2013-02-102-1/+1
|\ \ \ | | | | | | | | Update to latest Unicode data.
| * | | Update to latest Unicode data.Norman Clarke2013-02-102-1/+1
| |/ / | | | | | | | | | Release notes at: http://www.unicode.org/versions/Unicode6.2.0/
* | | Merge pull request #8643 from tricknotes/remove-method-redefined-warningAndrew White2013-02-101-0/+1
|\ \ \ | | | | | | | | Remove method redefined warning
| * | | Remove method redefined warningRyunosuke SATO2013-02-111-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 gzipBeyond2013-02-103-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | added test for compress options of gzip update changelog
* | | | Update changelog from #9128 with author nameCarlos Antonio da Silva2013-02-061-2/+4
| | | | | | | | | | | | | | | | And improve AS changelog a bit [ci skip]
* | | | Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracyJeremy Kemper2013-02-063-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 Harton2013-01-313-2/+7
| | | | | | | | | | | | | | | | since it's allowed by the spec and is very useful.
* | | | Missing require extract_optionsAkira Matsuda2013-01-313-0/+3
|/ / /
* | | 'minitest/parallel_each' might not always be availableAkira Matsuda + Koichi Sasada2013-01-291-1/+4
| | |
* | | Needs to explicitly require 'minitest/parallel_each'Akira Matsuda + Koichi Sasada2013-01-291-0/+2
| | | | | | | | | | | | Minitest has changed to require this since https://github.com/seattlerb/minitest/commit/728054b
* | | revamps the RDoc of Object#tryXavier Noria2013-01-281-22/+30
| | |
* | | Move AS changelog entry to the top, improve AP changelog a bitCarlos Antonio da Silva2013-01-281-2/+2
| | | | | | | | | | | | [ci skip]
* | | no need for \Z, \z is more conciseXavier Noria2013-01-281-1/+1
| | |
* | | Merge pull request #8830 from antoinelyset/masterXavier Noria2013-01-283-5/+11
|\ \ \ | | | | | | | | Improve String#squish whitespaces matching
| * | | Improve String#squish whitespaces matchingAntoine Lyset2013-01-223-5/+11
| | | |
* | | | Use Encoding::UTF_8 constant :do_not_litter:Akira Matsuda2013-01-281-2/+2
| | | |
* | | | Use already defined Encoding constants rather than creating one-trip StringsAkira Matsuda2013-01-281-1/+1
| | | |