Merge pull request #5338 from reitermarkus/activesupport
Update ActiveSupport.
This commit is contained in:
commit
7c274f3daf
@ -162,19 +162,9 @@ class Pathname
|
|||||||
|
|
||||||
# NOTE: This always overwrites.
|
# NOTE: This always overwrites.
|
||||||
def atomic_write(content)
|
def atomic_write(content)
|
||||||
# The enclosing `mktmpdir` and the `chmod` are a workaround
|
File.atomic_write(self) do |file|
|
||||||
# for https://github.com/rails/rails/pull/34037.
|
|
||||||
Dir.mktmpdir(".d", dirname) do |tmpdir|
|
|
||||||
should_fix_sticky_bit = dirname.world_writable? && !dirname.sticky?
|
|
||||||
FileUtils.chmod "+t", dirname if should_fix_sticky_bit
|
|
||||||
begin
|
|
||||||
File.atomic_write(self, tmpdir) do |file|
|
|
||||||
file.write(content)
|
file.write(content)
|
||||||
end
|
end
|
||||||
ensure
|
|
||||||
FileUtils.chmod "-t", dirname if should_fix_sticky_bit
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# @private
|
# @private
|
||||||
|
|||||||
4
Library/Homebrew/vendor/Gemfile.lock
vendored
4
Library/Homebrew/vendor/Gemfile.lock
vendored
@ -1,7 +1,7 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
activesupport (5.2.1)
|
activesupport (5.2.2)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
@ -49,4 +49,4 @@ DEPENDENCIES
|
|||||||
ruby-macho
|
ruby-macho
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.16.6
|
1.17.1
|
||||||
|
|||||||
@ -3,12 +3,12 @@ require 'rbconfig'
|
|||||||
ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
|
ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
|
||||||
ruby_version = RbConfig::CONFIG["ruby_version"]
|
ruby_version = RbConfig::CONFIG["ruby_version"]
|
||||||
path = File.expand_path('..', __FILE__)
|
path = File.expand_path('..', __FILE__)
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/concurrent-ruby-1.0.5/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/concurrent-ruby-1.1.3/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.1.1/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.1.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.11.3/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.11.3/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thread_safe-0.3.6/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thread_safe-0.3.6/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tzinfo-1.2.5/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tzinfo-1.2.5/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-5.2.1/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-5.2.2/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.0/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/backports-3.11.4/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/backports-3.11.4/lib"
|
||||||
$:.unshift "#{path}/"
|
$:.unshift "#{path}/"
|
||||||
|
|||||||
@ -29,7 +29,7 @@ class File
|
|||||||
old_stat = if exist?(file_name)
|
old_stat = if exist?(file_name)
|
||||||
# Get original file permissions
|
# Get original file permissions
|
||||||
stat(file_name)
|
stat(file_name)
|
||||||
elsif temp_dir != dirname(file_name)
|
else
|
||||||
# If not possible, probe which are the default permissions in the
|
# If not possible, probe which are the default permissions in the
|
||||||
# destination directory.
|
# destination directory.
|
||||||
probe_stat_in(dirname(file_name))
|
probe_stat_in(dirname(file_name))
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user