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>2023-01-11 16:22:01 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-11 16:22:16 +0300
commit01496e9337972f1ea0256bcd1e12996edb883e54 (patch)
treeeed61c95985d0afaedf97c9c661018d5cc60d545 /lib/gitlab
parent8db23545d53ecbd4ea6438f59ab12513d873bf18 (diff)
Add latest changes from gitlab-org/gitlab@15-7-stable-ee
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/memory/watchdog.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/memory/watchdog.rb b/lib/gitlab/memory/watchdog.rb
index 25af5bd781a..aac70a2f6aa 100644
--- a/lib/gitlab/memory/watchdog.rb
+++ b/lib/gitlab/memory/watchdog.rb
@@ -65,7 +65,7 @@ module Gitlab
while @alive
sleep(sleep_time_seconds)
- monitor if Feature.enabled?(:gitlab_memory_watchdog, type: :ops)
+ monitor
end
event_reporter.stopped(log_labels(memwd_reason: @reason).compact)