diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-04 22:51:02 +0200 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-04 22:51:02 +0200 |
| commit | 4cfc6a9f10b41dbb556f43f841c0a4dd50703123 (patch) | |
| tree | 4b3883ba820cc3e09932a1bfc7f45ded91488339 | |
| parent | 0b5ff7dd2e80be6fc71cc45d3fe9003be396abed (diff) | |
| download | gitlab-ce-4cfc6a9f10b41dbb556f43f841c0a4dd50703123.tar.gz | |
Fix db/fixtures
| -rw-r--r-- | db/fixtures/development/99_common_metrics.rb | 2 | ||||
| -rw-r--r-- | db/fixtures/production/999_common_metrics.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20180831164909_import_common_metrics.rb | 2 | ||||
| -rw-r--r-- | doc/development/prometheus_metrics.md | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/db/fixtures/development/99_common_metrics.rb b/db/fixtures/development/99_common_metrics.rb index db8e894e762..1f39c0ce5a0 100644 --- a/db/fixtures/development/99_common_metrics.rb +++ b/db/fixtures/development/99_common_metrics.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative '../importers/common_metrics_importer.rb' +require Rails.root.join('db/importers/common_metrics_importer.rb') ::Importers::CommonMetricsImporter.new.execute diff --git a/db/fixtures/production/999_common_metrics.rb b/db/fixtures/production/999_common_metrics.rb index db8e894e762..1f39c0ce5a0 100644 --- a/db/fixtures/production/999_common_metrics.rb +++ b/db/fixtures/production/999_common_metrics.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative '../importers/common_metrics_importer.rb' +require Rails.root.join('db/importers/common_metrics_importer.rb') ::Importers::CommonMetricsImporter.new.execute diff --git a/db/migrate/20180831164909_import_common_metrics.rb b/db/migrate/20180831164909_import_common_metrics.rb index cb7cfe3c1da..72658c09b8e 100644 --- a/db/migrate/20180831164909_import_common_metrics.rb +++ b/db/migrate/20180831164909_import_common_metrics.rb @@ -3,7 +3,7 @@ class ImportCommonMetrics < ActiveRecord::Migration include Gitlab::Database::MigrationHelpers - require_relative '../importers/common_metrics_importer.rb' + require Rails.root.join('db/importers/common_metrics_importer.rb') DOWNTIME = false diff --git a/doc/development/prometheus_metrics.md b/doc/development/prometheus_metrics.md index 488d344b8cc..6977815a979 100644 --- a/doc/development/prometheus_metrics.md +++ b/doc/development/prometheus_metrics.md @@ -31,7 +31,9 @@ After you add or change existing _common_ metric you have to create a new databa ```ruby class ImportCommonMetrics < ActiveRecord::Migration - require_relative '../importers/common_metrics_importer.rb' + include Gitlab::Database::MigrationHelpers + + require Rails.root.join('db/importers/common_metrics_importer.rb') DOWNTIME = false |