| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
This reverts commit 6d800a909e24465ca6f3fa5206222fa7d78967f6, reversing
changes made to 6a051299f98ee43864326c6c0a4f7d169d22b3f8.
We don't apply non-security fixes to 3-2-stable branch!!!
|
|
|
| |
File.exists? is a deprecated name, use File.exist?
|
| |
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 3-2-15:
bumping to rc3
Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"
bumping to rc2
Merge pull request #12443 from arthurnn/add_inverse_of_add_target
bumping version to 3.2.15.rc1
Fix STI scopes using benolee's suggestion. Fixes #11939
|
| | |
|
| | |
|
| | |
|
|/
|
|
|
| |
This avoids potential format string vulnerabilities where user-provided
data is interpolated into the log message before String#% is called.
|
| |
|
|
|
|
|
|
|
| |
Fix FileStore#cleanup to no longer rely on missing each_key method
Conflicts:
activesupport/CHANGELOG.md
activesupport/test/caching_test.rb
|
| |
|
| |
|
|\ |
|
| | |
|
| | |
|
| | |
|
| | |
|
|/
|
|
|
|
| |
abstracter wraps a TaggedLogging instance.
It's also best practice when overriding method_missing.
|
|
|
|
|
|
|
|
|
|
| |
If the DateTime core extensions were loaded before the Date core extensions
then you would get a superclass mismatch as DateTime hasn't been defined
yet so it gets set to Object by the acts_like core extension.
Fixes #11206
(cherry picked from commit 78f7d5b652000dbb1a11d34fe370c3fa82de840c)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The standard Ruby behavior for Time.at is to return the same type of
time when passing an instance of Time as a single argument. Since the
an ActiveSupport::TimeWithZone instance may be a different timezone than
the system timezone and DateTime just understands offsets the best we
can do is to return an instance of Time with the correct offset.
It also maintains the correct fractional second value as well.
Fixes #11350.
Backports:
484253515c0e05760541dc48946361185c9e6904
1b3873730b96035a238dbff7627bd5942e6dc4e7
|
| |
|
| |
|
| |
|
|
|
|
| |
is not provided.
|
| |
|
|
|
|
|
|
|
| |
Time.at allows passing a single Time argument which is then converted
to an integer. The conversion code since 1.9.3r429 explicitly checks
for an instance of Time so we need to override it to allow DateTime
and ActiveSupport::TimeWithZone values.
|
| |
|
|
|
|
| |
The default enconding changed on Ruby 2.0
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 815a9431ab61376a7e8e1bdff21f87bc557992f8.
Conflicts:
activesupport/test/json/encoding_test.rb
Reason: This was causing a regression where the resulting string is always
returning UTF-8. Also it changes the behavior of this method on a stable release.
Fixes #9498.
|
|
|
|
| |
Set "March 18, 2013" as the release date for 3.2.13
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 3-2-13:
bumping to 3.2.13
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]
Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets
bumping to rc2
Revert "Merge pull request #8209 from senny/backport_8176"
Freeze columns only once per Result
Preparing for 3.2.13.rc1 release
Update CHANGELOGs for 3.2.13 release.
Conflicts:
actionmailer/CHANGELOG.md
actionpack/CHANGELOG.md
activemodel/CHANGELOG.md
activeresource/CHANGELOG.md
activesupport/CHANGELOG.md
railties/CHANGELOG.md
|
| | |
|
| |
| |
| |
| |
| | |
Conflicts:
activesupport/test/xml_mini/jdom_engine_test.rb
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The previous implementation `ActiveSupport::TimeZone.parse` used `Time.parse`
which applies the system time DST rules to the parsed time. Instead we now
use `Time.utc` and manually apply the offset.
Backport tests from:
005d910624bbfa724b638426a000c8074d4201a2
c89b6c4cdce7ee55ed3665c099d914222fe0344a
03becb13099c439f6aea5058546bc8b0b19b8db8
Fixes #9678.
|
| | |
|
|/
|
|
|
| |
v0.6.2 and v0.6.3 both have issues with Ruby 1.8.7, see
https://github.com/svenfuchs/i18n/issues/192 for more info.
|
|
|
|
|
| |
Apparently 0.6.2 has a call to force_encoding, which is not around
in 1.8.7.
|
| |
|
|
|
|
| |
method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.
|
|
|
|
|
|
|
|
|
|
| |
For some reason, redirecting cache's logger to '/dev/null' resulting in
a test failures and LoadError. I think it's because of Thread issue.
Instead of trying to make every logger threadsafe for Rails 3.2, I think
it's better to just don't set the logger for now.
(Note: resetting the logger back to original value in the teardown block
didn't fix the problem.)
|