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
This commit is contained in:
Robert Speicher 2016-05-27 17:35:28 +00:00
commit f9bb9151b5
2 changed files with 2 additions and 1 deletions

View file

@ -15,6 +15,7 @@ v 8.9.0 (unreleased)
v 8.8.3 v 8.8.3
- Fix gitlab importer failing to import new projects due to missing credentials - 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 v 8.8.2
- Added remove due date button. !4209 - Added remove due date button. !4209

View file

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