diff options
| author | John Jarvis <jarv@gitlab.com> | 2018-12-21 11:09:22 +0300 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2018-12-21 11:09:22 +0300 |
| commit | fbd4319a828bda140f000dd653fe3d4ad5f837bb (patch) | |
| tree | 97cb98b26eceebd13d05a63ce39e1332770a6335 /spec/support | |
| parent | 3f9724f6fe061ba8f86041e3e3afc1aadb5a8478 (diff) | |
| parent | 43cc0d5a4ad4464901f700c0a46dbd304c1005c8 (diff) | |
Merge branch 'security-import-symlink' into 'master'
[master] Persistent Symlink in Project Import
See merge request gitlab/gitlabhq!2673
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/import_export/export_file_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/import_export/export_file_helper.rb b/spec/support/import_export/export_file_helper.rb index a49036c3b80..ac320934f5a 100644 --- a/spec/support/import_export/export_file_helper.rb +++ b/spec/support/import_export/export_file_helper.rb @@ -133,6 +133,6 @@ module ExportFileHelper end def file_permissions(file) - File.stat(file).mode & 0777 + File.lstat(file).mode & 0777 end end |