diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-26 16:57:26 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-26 16:57:26 +0000 |
| commit | f980827ba65c1237fca74ccb4452b78785d2ce1b (patch) | |
| tree | 9c6e61554be235b5cd419cee53957c213d3d57ee | |
| parent | 7fef8456e8bc92adb0de3f2bc7192e3bedfce47d (diff) | |
| parent | 00c631573f1f7564cfd8d823dce761fc6c76e2bc (diff) | |
| download | gitlab-ce-f980827ba65c1237fca74ccb4452b78785d2ce1b.tar.gz | |
Merge branch 'fix_gitlab_importer' into 'master'
Fix GitLab && Gitorious importers. Hide already imported projects
Fixes #2060
See merge request !1594
| -rw-r--r-- | app/controllers/import/gitlab_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/import/gitorious_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb index 74f992b4699..e979dad4b11 100644 --- a/app/controllers/import/gitlab_controller.rb +++ b/app/controllers/import/gitlab_controller.rb @@ -17,7 +17,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 diff --git a/app/controllers/import/gitorious_controller.rb b/app/controllers/import/gitorious_controller.rb index 627b4a171b8..6067a87ee04 100644 --- a/app/controllers/import/gitorious_controller.rb +++ b/app/controllers/import/gitorious_controller.rb @@ -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 |