diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-11 13:39:36 +0300 |
|---|---|---|
| committer | Thiago Presa <tpresa@gitlab.com> | 2018-09-11 21:32:23 +0300 |
| commit | a7e7b59cde4bac7dacd754ac83afd3a08ba54783 (patch) | |
| tree | dedd1209e96be1d9e7904385769adc7c351487b5 /lib | |
| parent | 77e6c886329e97cafcc5c7bc046c7795dfb98997 (diff) | |
Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'
Resolve "Project export broken when avatar is set"
Closes #51318
See merge request gitlab-org/gitlab-ce!21649
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/avatar_restorer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/avatar_restorer.rb b/lib/gitlab/import_export/avatar_restorer.rb index ded05f73cf8..17796430811 100644 --- a/lib/gitlab/import_export/avatar_restorer.rb +++ b/lib/gitlab/import_export/avatar_restorer.rb @@ -19,7 +19,7 @@ module Gitlab private def avatar_export_file - @avatar_export_file ||= Dir["#{avatar_export_path}/**/*"].first + @avatar_export_file ||= Dir["#{avatar_export_path}/**/*"].find { |f| File.file?(f) } end def avatar_export_path |