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-12-13 06:07:09 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-13 06:07:09 +0300
commitb4558e74dac09cdce238caa99f89f5ff9863815c (patch)
tree464a588b27baf646d06a11735e742ac0bc868311 /lib/gitlab/bullet.rb
parent886f0a286c2b7efb048fb30199cb4d691a722cc9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/bullet.rb')
-rw-r--r--lib/gitlab/bullet.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/bullet.rb b/lib/gitlab/bullet.rb
index f5f8a316855..9759a82be0c 100644
--- a/lib/gitlab/bullet.rb
+++ b/lib/gitlab/bullet.rb
@@ -10,7 +10,7 @@ module Gitlab
alias_method :extra_logging_enabled?, :enabled?
def configure_bullet?
- defined?(::Bullet) && (enabled? || Rails.env.development?)
+ defined?(::Bullet) && (enabled? || Gitlab.config.bullet.enabled)
end
end
end