summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-11 13:22:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-11 13:22:16 +0000
commit01496e9337972f1ea0256bcd1e12996edb883e54 (patch)
treeeed61c95985d0afaedf97c9c661018d5cc60d545 /config
parent8db23545d53ecbd4ea6438f59ab12513d873bf18 (diff)
downloadgitlab-ce-01496e9337972f1ea0256bcd1e12996edb883e54.tar.gz
Add latest changes from gitlab-org/gitlab@15-7-stable-ee
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/ops/enforce_memory_watchdog.yml2
-rw-r--r--config/feature_flags/ops/gitlab_memory_watchdog.yml8
2 files changed, 1 insertions, 9 deletions
diff --git a/config/feature_flags/ops/enforce_memory_watchdog.yml b/config/feature_flags/ops/enforce_memory_watchdog.yml
index fae127564c9..ae0ab81f9f6 100644
--- a/config/feature_flags/ops/enforce_memory_watchdog.yml
+++ b/config/feature_flags/ops/enforce_memory_watchdog.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367534
milestone: '15.2'
type: ops
group: group::application performance
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/ops/gitlab_memory_watchdog.yml b/config/feature_flags/ops/gitlab_memory_watchdog.yml
deleted file mode 100644
index f4c9a489864..00000000000
--- a/config/feature_flags/ops/gitlab_memory_watchdog.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: gitlab_memory_watchdog
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91910
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367534
-milestone: '15.2'
-type: ops
-group: group::application performance
-default_enabled: false