Commit fc5f6943 authored by James Lopez's avatar James Lopez

yay finally importing working with the new services structure

parent ff44198e
...@@ -33,7 +33,7 @@ class Import::GitlabProjectsController < Import::BaseController ...@@ -33,7 +33,7 @@ class Import::GitlabProjectsController < Import::BaseController
private private
def file_is_valid? 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 end
def verify_project_and_namespace_access def verify_project_and_namespace_access
......
...@@ -17,13 +17,13 @@ module Gitlab ...@@ -17,13 +17,13 @@ module Gitlab
error_out(error.message, caller[0].dup) error_out(error.message, caller[0].dup)
@errors << error.message @errors << error.message
# Debug: # Debug:
logger.error(error.backtrace) Rails.logger.error(error.backtrace)
end end
private private
def error_out(message, caller) 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 end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment