| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
| |
|
|
|
|
|
|
| |
This reverts commit 046e27a7338f2961c10e9d133e0e2229b51c2ba8.
Check https://github.com/rails/rails/pull/8815#issuecomment-14026122 for
details.
|
|\
| |
| | |
AS JSON encoder: remove monkey patch of Array
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
See the first FIXME comment in the patch for the rationale.
|
|\ \
| | |
| | | |
Address edge case for number_to_human with units option.
|
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
|/ / |
|
| | |
|
| |
| |
| |
| | |
ParallelEach
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
guides/source/upgrading_ruby_on_rails.md
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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'`.
|
|\ \ \
| | | |
| | | | |
Update to latest Unicode data.
|
| |/ /
| | |
| | |
| | | |
Release notes at: http://www.unicode.org/versions/Unicode6.2.0/
|
|\ \ \
| | | |
| | | | |
Remove method redefined warning
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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 test for compress options of gzip
update changelog
|
|\ \ \ \
| |_|/ /
|/| | | |
Modify TimeWithZone#as_json to return 3DP of sub-second accuracy.
|
| | | |
| | | |
| | | |
| | | | |
since it's allowed by the spec and is very useful.
|
|/ / / |
|
| | | |
|
| | |
| | |
| | |
| | | |
Minitest has changed to require this since https://github.com/seattlerb/minitest/commit/728054b
|
| | | |
|
| | | |
|
|\ \ \
| | | |
| | | | |
Improve String#squish whitespaces matching
|
| | | | |
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | | |
Conflicts:
actionpack/lib/action_view/helpers/form_options_helper.rb
guides/code/getting_started/app/controllers/comments_controller.rb
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
configuration"
This reverts commit 39374aa925a7d670b039c0c0c9aa9f4aef19466b.
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | | |
Inflector irregular singularize rules
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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)
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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 i18n symbol dependency
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | |
|
| | | | | | |
|
|/ / / / /
| | | | |
| | | | |
| | | | |
| | | | | |
This may or may not fix the intermittent railties failures we've been
seeing on the CI with Ruby 2.0. We'll see.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Date#to_time and Date#xmlschema methods defined in Ruby 1.9.3
|
| | | | |
| | | | |
| | | | |
| | | | | |
[ci skip]
|