diff options
author | James Lopez <james@jameslopez.es> | 2016-06-14 21:03:14 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-06-14 21:03:14 +0200 |
commit | ff44198e17320c50ab9b4dc75ce72ad1be01ae52 (patch) | |
tree | 34b36cd920e36226ad5644c067b062b377564e8e /app/controllers/import | |
parent | b53ed84843b97c45bb19095cd2c7e0e8c86eb41a (diff) | |
download | gitlab-ce-ff44198e17320c50ab9b4dc75ce72ad1be01ae52.tar.gz |
few fixes after refactoring the whole UI stuff
Diffstat (limited to 'app/controllers/import')
-rw-r--r-- | app/controllers/import/gitlab_projects_controller.rb | 6 |
1 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 f7fddde37e6..aabb5cbb6b6 100644 --- a/app/controllers/import/gitlab_projects_controller.rb +++ b/app/controllers/import/gitlab_projects_controller.rb @@ -14,7 +14,7 @@ class Import::GitlabProjectsController < Import::BaseController @project = Gitlab::ImportExport::ProjectCreator.new(project_params[:namespace_id], current_user, - File.expand_path(params[:file].path), + File.expand_path(project_params[:file].path), project_params[:path]).execute if @project.saved? @@ -33,7 +33,7 @@ class Import::GitlabProjectsController < Import::BaseController private def file_is_valid? - params[:file].respond_to?(:read) && params[:file].content_type == 'application/x-gzip' + project_params[:file].respond_to?(:read) && project_params[:file].content_type == 'application/x-gzip' end def verify_project_and_namespace_access @@ -52,7 +52,7 @@ class Import::GitlabProjectsController < Import::BaseController def project_params params.permit( - :path, :namespace_id, + :path, :namespace_id, :file ) end end |