| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
stopdropandrew/Instrumenter#instrument-yields-payload
ActiveSupport::Notifications::Instrumenter#instrument should yield
Conflicts:
activesupport/CHANGELOG.md
|
| |
| |
| |
| | |
its payload the same way that ActiveSupport::Notifications does.
Fix spelling in test name.
|
| | |
|
| | |
|
|\ \
| | |
| | | |
Add #to_s method to VERSION modules
|
| | | |
|
|/ /
| |
| |
| | |
rest of the code the wat the includes are done
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* master-sec:
fix protocol checking in sanitization [CVE-2013-1857]
JDOM XXE Protection [CVE-2013-1856]
fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]
stop calling to_sym when building arel nodes [CVE-2013-1854]
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Closes #9772.
`TimeWithZone` delegates everything to the wrapped `Time` object
using `method_missing`. The result is that `NoMethodError` error
will be raised in the context of `Time` which leads to a misleading
debug output.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 867dc1700f32aae6f98c4651bd501597e6b52bc0, reversing
changes made to 9a421aaa8285cf2a7ecb1af370748b0337818930.
This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065
Please see comments on #8156 for some discussion.
|
| | |
| | |
| | |
| | | |
disregarding specified acronyms, fixes #8015
|
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit b7d9d6e2cd5082d269dafbc0316e2107febe1451.
Per discussion with @jeremy and @rubys on Campfire.
|
| | | |
|
| | |
| | |
| | |
| | | |
:heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart: @pixeltrix
|
| | | |
|
| | | |
|
|/ / |
|
| | |
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| | | |
|
| | | |
|