Add latest changes from gitlab-org/gitlab@15-7-stable-ee

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/api/container_registry_event.rb b/lib/api/container_registry_event.rb
index 9e59401ddf6..9467f09e4b6 100644
--- a/lib/api/container_registry_event.rb
+++ b/lib/api/container_registry_event.rb
@@ -34,8 +34,8 @@ module API
       end
       params do
         requires :events, type: Array, desc: 'Event notifications' do
-          requires :action, type: String, desc: 'The action to perform, `push`, `delete`',
-                            values: %w[push delete].freeze
+          requires :action, type: String, desc: 'The action to perform, `push`, `delete`, `pull`',
+                            values: %w[push delete pull].freeze
           optional :target, type: Hash, desc: 'The target of the action' do
             optional :tag, type: String, desc: 'The target tag', documentation: { example: 'latest' }
             optional :repository, type: String, desc: 'The target repository', documentation: { example: 'group/p1' }
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)