diff --git a/app/controllers/import/gitlab_projects_controller.rb b/app/controllers/import/gitlab_projects_controller.rb index aabb5cbb6b630873a2b0153d85754c3f573d92e8..1de4c4828d26a84e5539d8743b01d3e0e249d27f 100644 --- a/app/controllers/import/gitlab_projects_controller.rb +++ b/app/controllers/import/gitlab_projects_controller.rb @@ -33,7 +33,7 @@ class Import::GitlabProjectsController < Import::BaseController private def file_is_valid? - project_params[:file].respond_to?(:read) && project_params[:file].content_type == 'application/x-gzip' + project_params[:file].respond_to?(:read) end def verify_project_and_namespace_access diff --git a/lib/gitlab/import_export/shared.rb b/lib/gitlab/import_export/shared.rb index 46490c221a10baad7ac64a3d9bfef609f5d7b10d..6aff05b886a011c230bc5649a394be5ca48a8c85 100644 --- a/lib/gitlab/import_export/shared.rb +++ b/lib/gitlab/import_export/shared.rb @@ -17,13 +17,13 @@ module Gitlab error_out(error.message, caller[0].dup) @errors << error.message # Debug: - logger.error(error.backtrace) + Rails.logger.error(error.backtrace) end private def error_out(message, caller) - logger.error("Import/Export error raised on #{caller}: #{message}") + Rails.logger.error("Import/Export error raised on #{caller}: #{message}") end end end diff --git a/spec/features/projects/import_export/test_project_export.tar.gz b/spec/features/projects/import_export/test_project_export.tar.gz index b85055070d821808e0ca0e52254bee72520637db..1fd04416d959363f9d348438c978330e58d2c704 100644 Binary files a/spec/features/projects/import_export/test_project_export.tar.gz and b/spec/features/projects/import_export/test_project_export.tar.gz differ