diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-02 11:02:52 +0300 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-02 11:02:52 +0300 |
| commit | f4023a69cb5e78fca595a2151a2272fbdfd5917a (patch) | |
| tree | 12bfc6bc746b80a1099431dccb8df0fcb30ad0fc /config/initializers | |
| parent | 79911cb4ddc8724cc2270570261e807a8cf7eb60 (diff) | |
| parent | a0ca86e5a3777bc4800fc96765d8536091671ef3 (diff) | |
Merge remote-tracking branch 'origin/master' into dev-master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/8_metrics.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index c8d261d415e..468f80939d7 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -98,7 +98,11 @@ end # check: https://github.com/rspec/rspec-mocks#settings-mocks-or-stubs-on-any-instance-of-a-class # # Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/33587 -if Gitlab::Metrics.enabled? && !Rails.env.test? +# +# In development mode, we turn off eager loading when we're running +# `rails generate migration` because eager loading short-circuits the +# loading of our custom migration templates. +if Gitlab::Metrics.enabled? && !Rails.env.test? && !(Rails.env.development? && defined?(Rails::Generators)) require 'pathname' require 'influxdb' require 'connection_pool' |