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

Merge branch 'fix/migration-uri-issue' into 'master'
f9bb9151 · Robert Speicher · 051b2bfa · e60d5f91 · f9bb9151 · f9bb9151
Commit f9bb9151 authored May 27, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

20160302152808_remove_wrong_import_url_from_projects.rb ...e/20160302152808_remove_wrong_import_url_from_projects.rb +1 -1

No files found.
--- 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

--- 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