diff options
| author | Matilda Smeds <matildasmeds@users.noreply.github.com> | 2018-12-09 18:28:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 18:28:00 +0100 |
| commit | 317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b (patch) | |
| tree | c7084e546cbc2f289ac8cf2057c1010b4dc7f880 /activesupport/lib/active_support/core_ext/file | |
| parent | a87c91cd3993d776dc987ac43b5f6c897baa3206 (diff) | |
| parent | bad1041b82df941d588ae2565f62424d88104933 (diff) | |
| download | rails-317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b.tar.gz rails-317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b.tar.bz2 rails-317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b.zip | |
Merge branch 'master' into guides_session_guidelines_2
Diffstat (limited to 'activesupport/lib/active_support/core_ext/file')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/file/atomic.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/file/atomic.rb b/activesupport/lib/active_support/core_ext/file/atomic.rb index 8e288833b6..9deceb1bb4 100644 --- a/activesupport/lib/active_support/core_ext/file/atomic.rb +++ b/activesupport/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)) |