Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
6139e143
Commit
6139e143
authored
May 03, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing some rubucop warnings
parent
9d306eb1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
app/controllers/import/gitlab_project_controller.rb
app/controllers/import/gitlab_project_controller.rb
+1
-2
app/workers/project_import_worker.rb
app/workers/project_import_worker.rb
+1
-1
No files found.
app/controllers/import/gitlab_project_controller.rb
View file @
6139e143
...
@@ -28,12 +28,11 @@ class Import::GitlabProjectController < Import::BaseController
...
@@ -28,12 +28,11 @@ class Import::GitlabProjectController < Import::BaseController
def
create
def
create
@file
=
params
[
:file
]
@file
=
params
[
:file
]
# @project_name =
repo_owner
=
current_user
.
username
repo_owner
=
current_user
.
username
@target_namespace
=
params
[
:new_namespace
].
presence
||
repo_owner
@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
)
@project
=
Gitlab
::
ImportExport
::
ImportService
.
execute
(
archive_file:
file
,
owner:
repo_owner
)
end
end
...
...
app/workers/project_impor_worker.rb
→
app/workers/project_impor
t
_worker.rb
View file @
6139e143
...
@@ -22,4 +22,4 @@ class ProjectImportWorker
...
@@ -22,4 +22,4 @@ class ProjectImportWorker
project
.
repository
.
after_import
project
.
repository
.
after_import
project
.
import_finish
project
.
import_finish
end
end
end
end
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment