summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2018-09-10 18:22:24 +0000
committerThiago Presa <tpresa@gitlab.com>2018-09-10 18:09:45 -0300
commitb9addefd076fe8b17fdf6c4fecffd8a8de620899 (patch)
tree11684948014e69df0c8ae3df09300d0b88b94fe3
parent162c1f6cec6b29e9918b12599a7c2589bc824d15 (diff)
downloadgitlab-ce-b9addefd076fe8b17fdf6c4fecffd8a8de620899.tar.gz
Merge branch 'bvl-move-import-common-metrics-migration' into 'master'
Reset column information before running CommonMetricsImporter Closes #51305 See merge request gitlab-org/gitlab-ce!21647
-rw-r--r--db/importers/common_metrics_importer.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/db/importers/common_metrics_importer.rb b/db/importers/common_metrics_importer.rb
index 3a150e8fc5f..01fbbd6866b 100644
--- a/db/importers/common_metrics_importer.rb
+++ b/db/importers/common_metrics_importer.rb
@@ -40,6 +40,8 @@ module Importers
end
def execute
+ PrometheusMetric.reset_column_information
+
process_content do |id, attributes|
find_or_build_metric!(id)
.update!(**attributes)