Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-07-06 00:08:45 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-07-06 00:08:45 +0300
commit5875e92ecfd43a6b5379bdc30c79eba6981d3bf8 (patch)
tree0abb4b53c3937d5c342ad920c6e9aac54e6a351e /lib/gitlab/tracking.rb
parente129eff88309eca18f3902afd710e2e07393fe45 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/tracking.rb')
-rw-r--r--lib/gitlab/tracking.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/tracking.rb b/lib/gitlab/tracking.rb
index ae3f02c8c1c..04745bafe7c 100644
--- a/lib/gitlab/tracking.rb
+++ b/lib/gitlab/tracking.rb
@@ -39,7 +39,9 @@ module Gitlab
end
def snowplow_micro_enabled?
- Rails.env.development? && Gitlab::Utils.to_boolean(ENV['SNOWPLOW_MICRO_ENABLE'])
+ Rails.env.development? && Gitlab.config.snowplow_micro.enabled
+ rescue Settingslogic::MissingSetting
+ Gitlab::Utils.to_boolean(ENV['SNOWPLOW_MICRO_ENABLE'])
end
private