summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-07 14:47:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-07 14:47:00 +0000
commit08086ff522742c28a6b10e9b2ed71f0af6633e5b (patch)
tree5a4fde8b23140cb4edf04b24854b53f87085dd42 /config
parent8f3fbbf0d56091ad87158f61bf2a4e96a7f937e3 (diff)
downloadgitlab-ce-08086ff522742c28a6b10e9b2ed71f0af6633e5b.tar.gz
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/development/remove_description_html_in_release_api.yml8
-rw-r--r--config/feature_flags/development/remove_description_html_in_release_api_override.yml8
2 files changed, 0 insertions, 16 deletions
diff --git a/config/feature_flags/development/remove_description_html_in_release_api.yml b/config/feature_flags/development/remove_description_html_in_release_api.yml
deleted file mode 100644
index 0c457dfe2e0..00000000000
--- a/config/feature_flags/development/remove_description_html_in_release_api.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: remove_description_html_in_release_api
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60380
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329188
-milestone: '13.12'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/remove_description_html_in_release_api_override.yml b/config/feature_flags/development/remove_description_html_in_release_api_override.yml
deleted file mode 100644
index f924f2ccbd5..00000000000
--- a/config/feature_flags/development/remove_description_html_in_release_api_override.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: remove_description_html_in_release_api_override
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60380
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329188
-milestone: '13.12'
-type: development
-group: group::release
-default_enabled: false