summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-12-19 16:40:43 +0000
committerRobert Speicher <rspeicher@gmail.com>2018-12-19 16:40:43 +0000
commitbecfb66213ba7aab8e9b8bb620d767884d548978 (patch)
treed1f36134b739b29b1a3d384b67922206bc1c96f6 /db
parent806ea5762baec558a85cd3edd36f82839bb1c904 (diff)
parentf63f165a1f01dd3f4ae23b6fd85828b4b038ff9d (diff)
downloadgitlab-ce-becfb66213ba7aab8e9b8bb620d767884d548978.tar.gz
Merge branch 'depracated-migration-inheritance' into 'master'
ActiveRecord::Migration -> ActiveRecord::Migration[5.0] for ImportCommonMetricsNginxVts See merge request gitlab-org/gitlab-ce!23910
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20181006004100_import_common_metrics_nginx_vts.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20181006004100_import_common_metrics_nginx_vts.rb b/db/migrate/20181006004100_import_common_metrics_nginx_vts.rb
index 98fafed7912..5cd312837df 100644
--- a/db/migrate/20181006004100_import_common_metrics_nginx_vts.rb
+++ b/db/migrate/20181006004100_import_common_metrics_nginx_vts.rb
@@ -1,4 +1,4 @@
-class ImportCommonMetricsNginxVts < ActiveRecord::Migration
+class ImportCommonMetricsNginxVts < ActiveRecord::Migration[5.0]
include Gitlab::Database::MigrationHelpers
require Rails.root.join('db/importers/common_metrics_importer.rb')