aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix deletion of empty directories:Charles Jones2013-02-251-2/+2
| | | | | | | | | | | | | | | 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.
* Preparing for 4.0.0.beta1 releaseDavid Heinemeier Hansson2013-02-251-1/+1
|
* Keep second fraction when DateTime#change is called.Chris Baynes2013-02-251-1/+1
|
* 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
| |
* | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility.stopdropandrew2013-02-241-0/+4
| |
* | 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.
* | Merge pull request #9347 from hoffm/number_to_human_bugSteve Klabnik2013-02-221-1/+1
|\ \ | | | | | | Address edge case for number_to_human with units option.
| * | Address edge case for number_to_human with units option.hoffm2013-02-221-1/+1
| | | | | | | | | | | | | | | | | | 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-212-0/+27
| |
* | Bump up minitest dependency and remove our own reinvented version of ↵Akira Matsuda2013-02-191-37/+1
| | | | | | | | 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-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | added test for compress options of gzip update changelog
* | | | Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracyJeremy Kemper2013-02-061-1/+1
|\ \ \ \ | |_|/ / |/| | | 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-311-1/+1
| | | | | | | | | | | | | | | | since it's allowed by the spec and is very useful.
* | | | Missing require extract_optionsAkira Matsuda2013-01-312-0/+2
|/ / /
* | | '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
| | |
* | | no need for \Z, \z is more conciseXavier Noria2013-01-281-1/+1
| | |
* | | Merge pull request #8830 from antoinelyset/masterXavier Noria2013-01-281-2/+5
|\ \ \ | | | | | | | | Improve String#squish whitespaces matching
| * | | Improve String#squish whitespaces matchingAntoine Lyset2013-01-221-2/+5
| | | |
* | | | Use already defined Encoding constants rather than creating one-trip StringsAkira Matsuda2013-01-281-1/+1
| | | |
* | | | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-01-262-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::ProxyObjectMatt Bridges2013-01-131-1/+1
| | | |
| * | | Clarified the minute option on DateTime#changeJakob Waller2013-01-101-1/+1
| | | |
* | | | Revert "Set the default timezone after the initialization since the ↵Carlos Antonio da Silva2013-01-221-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | configuration" This reverts commit 39374aa925a7d670b039c0c0c9aa9f4aef19466b.
* | | | resistance is futileXavier Noria2013-01-211-1/+1
| | | |
* | | | slices less, reads betterXavier Noria2013-01-211-13/+22
| | | |
* | | | Merge pull request #8671 from xuanxu/fix_irregularXavier Noria2013-01-211-0/+3
|\ \ \ \ | | | | | | | | | | Inflector irregular singularize rules
| * | | | Inflector irregular singularize rulesJuanjo Bazán2013-01-011-0/+3
| | | | |
* | | | | Use `DateTime.parse` inside `String#to_datetime`Andrew White2013-01-211-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the standard library's `DateTime.parse` because it's marginally faster and supports partial date/time strings. Benchmark: user system total real old 3.980000 0.000000 3.980000 ( 3.987606) new 3.640000 0.010000 3.650000 ( 3.641342)
* | | | | Standardise the return value of `to_time`Andrew White2013-01-212-19/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit standardises the return value of `to_time` to an instance of `Time` in the local system timezone, matching the Ruby core and standard library behavior. The default form for `String#to_time` has been changed from :utc to :local but research seems to suggest the latter is the more common form. Also fix an edge condition with `String#to_time` where the string has a timezone offset in it and the mode is :local. e.g: # Before: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 05:00:00 -0500 # After: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 00:00:00 -0500 Closes #2453
* | | | | Remove warning: shadowing outer local variableCarlos Antonio da Silva2013-01-191-1/+1
| | | | |
* | | | | Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependencyAaron Patterson2013-01-191-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Remove i18n symbol dependency
| * | | | | Remove i18n symbol dependencyChris McGrath2013-01-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | date.order is the only key in rails i18n that is required to be a symbol. This patch allows for symbols or strings which means: * No requirement for symbol type in .yml files. A future YAML.safe_load wouldn't need to load symbols * Rails could actually use json rather than yml as the backend
* | | | | | Refactor ActiveSupport::Cache::Store#fetch.Joey Butler2013-01-191-25/+41
| | | | | |
* | | | | | The test setup is not threadsafe. Wrap in a mutex.Jon Leighton2013-01-181-3/+7
| | | | | |
* | | | | | MiniTest already defines a ParallelEach classJon Leighton2013-01-181-23/+27
|/ / / / / | | | | | | | | | | | | | | | | | | | | This may or may not fix the intermittent railties failures we've been seeing on the CI with Ruby 2.0. We'll see.
* | | | | remove_possible_method -> remove_methodNihad Abbasov2013-01-111-2/+2
| | | | | | | | | | | | | | | | | | | | Date#to_time and Date#xmlschema methods defined in Ruby 1.9.3
* | | | | Updating Array access docs more consistentMatt Bridges2013-01-101-4/+4
| | | | | | | | | | | | | | | | | | | | [ci skip]