summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-09-29 12:08:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-09-29 12:08:49 +0000
commit9bf40d9fdc79fb09f67ac2b571467908758777ad (patch)
treed4f9eb07b6d4e37d79de2f8e4036fdf0bbe3d7a9 /config
parent946b1e2fe93357d596f37d3978cf682b8b837925 (diff)
downloadgitlab-ce-9bf40d9fdc79fb09f67ac2b571467908758777ad.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/development/usage_data_i_ci_secrets_management_vault_build_created.yml8
-rw-r--r--config/feature_flags/ops/jira_raise_timeouts.yml2
2 files changed, 1 insertions, 9 deletions
diff --git a/config/feature_flags/development/usage_data_i_ci_secrets_management_vault_build_created.yml b/config/feature_flags/development/usage_data_i_ci_secrets_management_vault_build_created.yml
deleted file mode 100644
index 0019b949a98..00000000000
--- a/config/feature_flags/development/usage_data_i_ci_secrets_management_vault_build_created.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_ci_secrets_management_vault_build_created
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46515
-rollout_issue_url:
-milestone: '13.6'
-type: development
-group: group::configure
-default_enabled: true
diff --git a/config/feature_flags/ops/jira_raise_timeouts.yml b/config/feature_flags/ops/jira_raise_timeouts.yml
index d1ab0ff0670..ac572b172fc 100644
--- a/config/feature_flags/ops/jira_raise_timeouts.yml
+++ b/config/feature_flags/ops/jira_raise_timeouts.yml
@@ -1,7 +1,7 @@
---
name: jira_raise_timeouts
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86439
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375587
milestone: '15.0'
type: ops
group: group::integrations