diff options
author | James Lopez <james@jameslopez.es> | 2016-06-14 21:41:40 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-06-14 21:41:40 +0200 |
commit | fc5f6943f80cfa8c228d0f03fb8940e7d04ea2be (patch) | |
tree | 666925a59303eeb7c7c46e5bb8fce648cececa13 | |
parent | ff44198e17320c50ab9b4dc75ce72ad1be01ae52 (diff) | |
download | gitlab-ce-fc5f6943f80cfa8c228d0f03fb8940e7d04ea2be.tar.gz |
yay finally importing working with the new services structure
-rw-r--r-- | app/controllers/import/gitlab_projects_controller.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/import_export/shared.rb | 4 | ||||
-rw-r--r-- | spec/features/projects/import_export/test_project_export.tar.gz | bin | 672360 -> 345686 bytes |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/import/gitlab_projects_controller.rb b/app/controllers/import/gitlab_projects_controller.rb index aabb5cbb6b6..1de4c4828d2 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 46490c221a1..6aff05b886a 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 Binary files differindex b85055070d8..1fd04416d95 100644 --- a/spec/features/projects/import_export/test_project_export.tar.gz +++ b/spec/features/projects/import_export/test_project_export.tar.gz |