Merge branch 'fix/import-templates-spec' into 'master'

Fix spec warnings and template helper See merge request gitlab-org/gitlab-ce!21007
2018-08-03 13:21:19 +00:00 · 2018-08-03 13:21:19 +00:00 · beda5ca507
parent d3a6712e41 107292dd3a
commit beda5ca507
2 changed files with 1 additions and 1 deletions
--- 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/services/gitlab_projects_import_service_shared_examples.rb
+++ b/spec/support/shared_examples/services/gitlab_projects_import_service_shared_examples.rb