diff options
author | James Lopez <james@jameslopez.es> | 2018-08-03 14:07:50 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2018-08-03 14:07:50 +0300 |
commit | 107292dd3ab26489ab8fe613b9b3185aa6d66087 (patch) | |
tree | 723c6c12300077eb4a989525185d256149486d46 | |
parent | b901df220c9411eba4f541ac91b3e275a0dfa1df (diff) |
Fix spec warnings and template helper
-rw-r--r-- | lib/gitlab/template_helper.rb | 2 | ||||
-rw-r--r-- | spec/support/shared_examples/services/gitlab_projects_import_service_shared_examples.rb (renamed from spec/support/shared_examples/gitlab_projects_import_service_shared_examples.rb) | 0 |
2 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) diff --git a/spec/support/shared_examples/gitlab_projects_import_service_shared_examples.rb b/spec/support/shared_examples/services/gitlab_projects_import_service_shared_examples.rb index b8db35a6ef9..b8db35a6ef9 100644 --- a/spec/support/shared_examples/gitlab_projects_import_service_shared_examples.rb +++ b/spec/support/shared_examples/services/gitlab_projects_import_service_shared_examples.rb |