diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-17 21:50:37 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-17 21:50:37 -0700 |
| commit | 4b3fb68c2da677a987f79e9c3f459f80c68bf33b (patch) | |
| tree | 570c952cd99313933cf7f362af94071e3cdaef80 /app/controllers/import | |
| parent | a19a5b57e464e53ad6e92c69f1e16f7cc0b27718 (diff) | |
| download | gitlab-ce-4b3fb68c2da677a987f79e9c3f459f80c68bf33b.tar.gz | |
Fix bug in rejecting already added repositories
Diffstat (limited to 'app/controllers/import')
| -rw-r--r-- | app/controllers/import/bitbucket_server_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/import/bitbucket_server_controller.rb b/app/controllers/import/bitbucket_server_controller.rb index 83949c8e840..d8464d29501 100644 --- a/app/controllers/import/bitbucket_server_controller.rb +++ b/app/controllers/import/bitbucket_server_controller.rb @@ -70,7 +70,7 @@ class Import::BitbucketServerController < Import::BaseController @already_added_projects = find_already_added_projects('bitbucket_server') already_added_projects_names = @already_added_projects.pluck(:import_source) - @repos.to_a.reject! { |repo| already_added_projects_names.include?(repo.full_name) } + @repos.to_a.reject! { |repo| already_added_projects_names.include?(repo.browse_url) } rescue *SERVER_ERRORS => e flash[:alert] = "Unable to connect to server: #{e}" clear_session_data |