diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-27 17:35:28 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-27 17:35:28 +0000 |
| commit | f9bb9151b595fdc1afc1742bb51c816965908f53 (patch) | |
| tree | 2486e16cd341d1643b8e6f70c789e6807161d2e9 | |
| parent | 051b2bfa4bf5bb2b7322258e369b1157085fdfdc (diff) | |
| parent | e60d5f91884cad68690282dd97b492d665f41b81 (diff) | |
| download | gitlab-ce-f9bb9151b595fdc1afc1742bb51c816965908f53.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index cf00bd9a5af..a0194a1ba25 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 |