summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-05-03 12:46:00 +0200
committerJames Lopez <james@jameslopez.es>2016-05-03 12:46:00 +0200
commit6139e1433c7f1925a7fc599106656990410a4184 (patch)
treeb67fbbad8839aa9f8ea436ce9ddc5ea51f09aa34 /app
parent9d306eb132bf153a0c93dd870d3a098028f12384 (diff)
downloadgitlab-ce-6139e1433c7f1925a7fc599106656990410a4184.tar.gz
fixing some rubucop warnings
Diffstat (limited to 'app')
-rw-r--r--app/controllers/import/gitlab_project_controller.rb3
-rw-r--r--app/workers/project_import_worker.rb (renamed from app/workers/project_impor_worker.rb)2
2 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/import/gitlab_project_controller.rb b/app/controllers/import/gitlab_project_controller.rb
index fa3e0c7876d..ab0da196ac1 100644
--- a/app/controllers/import/gitlab_project_controller.rb
+++ b/app/controllers/import/gitlab_project_controller.rb
@@ -28,12 +28,11 @@ class Import::GitlabProjectController < Import::BaseController
def create
@file = params[:file]
- # @project_name =
repo_owner = current_user.username
@target_namespace = params[:new_namespace].presence || repo_owner
- namespace = get_or_create_namespace || (render and return)
+ # namespace = get_or_create_namespace || (render and return)
@project = Gitlab::ImportExport::ImportService.execute(archive_file: file, owner: repo_owner)
end
diff --git a/app/workers/project_impor_worker.rb b/app/workers/project_import_worker.rb
index 0ef353fa441..0e8b9552442 100644
--- a/app/workers/project_impor_worker.rb
+++ b/app/workers/project_import_worker.rb
@@ -22,4 +22,4 @@ class ProjectImportWorker
project.repository.after_import
project.import_finish
end
-end \ No newline at end of file
+end