BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
c0f8b956
Commit
c0f8b956
authored
Feb 26, 2015
by
Dmitriy Zaporozhets
Committed by
Marin Jankovski
Mar 03, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'fix_gitlab_importer' into 'master'
Fix GitLab && Gitorious importers. Hide already imported projects Fixes #2060 See merge request !1594
parent
d59d4d41
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
gitlab_controller.rb
app/controllers/import/gitlab_controller.rb
+1
-1
gitorious_controller.rb
app/controllers/import/gitorious_controller.rb
+1
-1
No files found.
app/controllers/import/gitlab_controller.rb
View file @
c0f8b956
...
...
@@ -16,7 +16,7 @@ class Import::GitlabController < Import::BaseController
@already_added_projects
=
current_user
.
created_projects
.
where
(
import_type:
"gitlab"
)
already_added_projects_names
=
@already_added_projects
.
pluck
(
:import_source
)
@repos
.
to_a
.
reject!
{
|
repo
|
already_added_projects_names
.
include?
repo
[
"path_with_namespace"
]
}
@repos
=
@repos
.
to_a
.
reject
{
|
repo
|
already_added_projects_names
.
include?
repo
[
"path_with_namespace"
]
}
end
def
jobs
...
...
app/controllers/import/gitorious_controller.rb
View file @
c0f8b956
...
...
@@ -15,7 +15,7 @@ class Import::GitoriousController < Import::BaseController
@already_added_projects
=
current_user
.
created_projects
.
where
(
import_type:
"gitorious"
)
already_added_projects_names
=
@already_added_projects
.
pluck
(
:import_source
)
@repos
.
to_a
.
reject!
{
|
repo
|
already_added_projects_names
.
include?
repo
.
full_name
}
@repos
.
reject!
{
|
repo
|
already_added_projects_names
.
include?
repo
.
full_name
}
end
def
jobs
...
...
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