Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/depracated-migration-inheritance.yml

+---
+title: ActiveRecord::Migration -> ActiveRecord::Migration[5.0]
+merge_request: 23910
+author: Jasper Maes
+type: other

db/migrate/20181006004100_import_common_metrics_nginx_vts.rb

-class ImportCommonMetricsNginxVts < ActiveRecord::Migration
+class ImportCommonMetricsNginxVts < ActiveRecord::Migration[5.0]
   include Gitlab::Database::MigrationHelpers
 
   require Rails.root.join('db/importers/common_metrics_importer.rb')