diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-27 17:35:28 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-02 13:26:44 +0200 |
| commit | 322464ea927405af13ec91625f332a55de599a9e (patch) | |
| tree | b29c110e43493b8f98d211d5fc0f612a8e65cc1e | |
| parent | 0591d06b006e2a4f0b14e60c8a3c32e05c2cb826 (diff) | |
| download | gitlab-ce-322464ea927405af13ec91625f332a55de599a9e.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 | 2 | ||||
| -rw-r--r-- | db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 66d6d803130..18a3f2c3e0f 100644 --- a/CHANGELOG +++ b/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 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 |