Merge branch 'fix/migration-uri-issue' into 'master'

Fix import URL migration error

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17956

See merge request !4321

CHANGELOG

@@ -7,6 +7,8 @@ v 8.8.3
   - Fixed potential issue with 2 ci status polling events happening. !3869
   - Improve design of Pipeline View. !4230
   - Fix gitlab importer failing to import new projects due to missing credentials. !4301
+  - Fix gitlab importer failing to import new projects due to missing credentials
+  - Fix import URL migration not rescuing with the correct Error
 
 v 8.8.2
   - Added remove due date button. !4209

db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb

@@ -28,7 +28,7 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
 
         update_import_url(import_url, project)
         update_import_data(import_url, project)
-      rescue URI::InvalidURIError
+      rescue Addressable::URI::InvalidURIError
         nullify_import_url(project)
       end
     end