Merge remote-tracking branch 'origin/master' into dependabot/bundler/Library/Homebrew/vendor/rubocop-0.61.0

Library/Homebrew/extend/pathname.rb

@@ -162,18 +162,8 @@ class Pathname
 
   # NOTE: This always overwrites.
   def atomic_write(content)
-    # The enclosing `mktmpdir` and the `chmod` are a workaround
-    # 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)
-        end
-      ensure
-        FileUtils.chmod "-t", dirname if should_fix_sticky_bit
-      end
+    File.atomic_write(self) do |file|
+      file.write(content)
     end
   end
 

Library/Homebrew/vendor/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -49,4 +49,4 @@ DEPENDENCIES
   ruby-macho
 
 BUNDLED WITH
-   1.16.6
+   1.17.1

Library/Homebrew/vendor/bundle-standalone/bundler/setup.rb

@@ -8,7 +8,7 @@ $:.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/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/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/backports-3.11.4/lib"
 $:.unshift "#{path}/"

Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/file/atomic.rb

@@ -29,7 +29,7 @@ class File
       old_stat = if exist?(file_name)
         # Get original file permissions
         stat(file_name)
-      elsif temp_dir != dirname(file_name)
+      else
         # If not possible, probe which are the default permissions in the
         # destination directory.
         probe_stat_in(dirname(file_name))