summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-05-27 17:20:15 +0200
committerJames Lopez <james@jameslopez.es>2016-05-27 17:20:15 +0200
commite60d5f91884cad68690282dd97b492d665f41b81 (patch)
tree061104e68712957dff89947c023022d2bcce9b97
parentd59f0d90e4eb2feff510cd7fb344e46b0286a1df (diff)
downloadgitlab-ce-e60d5f91884cad68690282dd97b492d665f41b81.tar.gz
fix rescue block on migration
-rw-r--r--CHANGELOG1
-rw-r--r--db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ed454903a8d..c10051d89a2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ v 8.9.0 (unreleased)
v 8.8.3
- 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
diff --git a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
index 561c18a5776..6aed0fe03d2 100644
--- a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
+++ b/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