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-20 17:22:11 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-20 17:22:11 +0300
commit0c872e02b2c822e3397515ec324051ff540f0cd5 (patch)
treece2fb6ce7030e4dad0f4118d21ab6453e5938cdd /lib/gitlab/bullet.rb
parentf7e05a6853b12f02911494c4b3fe53d9540d74fc (diff)
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
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