Fix spec warnings and template helper

107292dd · James Lopez · b901df22 · 107292dd · 107292dd
Commit 107292dd authored Aug 03, 2018 by James Lopez
Showing with 1 addition and 1 deletion

lib/gitlab/template_helper.rb lib/gitlab/template_helper.rb +1 -1

spec/support/shared_examples/services/gitlab_projects_import_service_shared_examples.rb ...ervices/gitlab_projects_import_service_shared_examples.rb +0 -0

No files found.
--- 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)

--- a/spec/support/shared_examples/gitlab_projects_import_service_shared_examples.rb
+++ b/spec/support/shared_examples/gitlab_projects_import_service_shared_examples.rb