diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-03 16:21:19 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-03 16:21:19 +0300 |
| commit | beda5ca507ba2c5ce1617be4c21d3a3076f25d3e (patch) | |
| tree | d2edcc0375731a1aa999c1e7ad6095a0f8ae8d46 /lib | |
| parent | d3a6712e419bc6fc2c11a584d17ec83c2c2d3522 (diff) | |
| parent | 107292dd3ab26489ab8fe613b9b3185aa6d66087 (diff) | |
Merge branch 'fix/import-templates-spec' into 'master'
Fix spec warnings and template helper
See merge request gitlab-org/gitlab-ce!21007
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/template_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/template_helper.rb b/lib/gitlab/template_helper.rb index 3918abaab45..f24a01e6cf5 100644 --- a/lib/gitlab/template_helper.rb +++ b/lib/gitlab/template_helper.rb @@ -3,7 +3,7 @@ module Gitlab include Gitlab::Utils::StrongMemoize def prepare_template_environment(file) - return unless file&.path.present? + return unless file if Gitlab::ImportExport.object_storage? params[:import_export_upload] = ImportExportUpload.new(import_file: file) |