Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 10 deletions

diff --git a/config/feature_flags/development/ci_validate_build_dependencies.yml b/config/feature_flags/development/ci_validate_build_dependencies.yml
new file mode 100644
index 00000000000..885bdcf0c20
--- /dev/null
+++ b/config/feature_flags/development/ci_validate_build_dependencies.yml
@@ -0,0 +1,8 @@
+---
+name: ci_validate_build_dependencies
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14009
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257852
+milestone: '10.3'
+type: development
+group: group::continuous integration
+default_enabled: true
diff --git a/config/feature_flags/development/ci_disable_validates_dependencies.yml b/config/feature_flags/development/ci_validate_build_dependencies_override.yml
index fd5b3d41eef..bce4b88ca39 100644
--- a/config/feature_flags/development/ci_disable_validates_dependencies.yml
+++ b/config/feature_flags/development/ci_validate_build_dependencies_override.yml
@@ -1,7 +1,7 @@
 ---
-name: ci_disable_validates_dependencies
+name: ci_validate_build_dependencies_override
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14009
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257847
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257852
 milestone: '10.3'
 type: development
 group: group::continuous integration
diff --git a/config/feature_flags/development/jira_sync_deployments.yml b/config/feature_flags/development/jira_sync_deployments.yml
deleted file mode 100644
index 8a644d43ba0..00000000000
--- a/config/feature_flags/development/jira_sync_deployments.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: jira_sync_deployments
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49757
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294034
-milestone: '13.7'
-type: development
-group: group::ecosystem
-default_enabled: false