diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-12 15:08:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-12 15:08:30 +0300 |
| commit | cb3b9f9243555b0c26145e2992a9f01f7fa47bf5 (patch) | |
| tree | 5fea3438f0c21330e2fba8c958cbc505810ab990 /config | |
| parent | 71d34aac9a0fae0507c265929767422391816b01 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/remove_sha_from_releases_json.yml (renamed from config/feature_flags/development/fix_related_environments_for_merge_requests.yml) | 10 | ||||
| -rw-r--r-- | config/feature_flags/undefined/gitaly_replace_wiki_update_page.yml | 8 |
2 files changed, 5 insertions, 13 deletions
diff --git a/config/feature_flags/development/fix_related_environments_for_merge_requests.yml b/config/feature_flags/development/remove_sha_from_releases_json.yml index d958f1d4de0..27b62c62978 100644 --- a/config/feature_flags/development/fix_related_environments_for_merge_requests.yml +++ b/config/feature_flags/development/remove_sha_from_releases_json.yml @@ -1,8 +1,8 @@ --- -name: fix_related_environments_for_merge_requests -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83382 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356642 -milestone: '14.10' +name: remove_sha_from_releases_json +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86233 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360903 +milestone: '15.0' type: development group: group::release -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/undefined/gitaly_replace_wiki_update_page.yml b/config/feature_flags/undefined/gitaly_replace_wiki_update_page.yml deleted file mode 100644 index 4cc89769420..00000000000 --- a/config/feature_flags/undefined/gitaly_replace_wiki_update_page.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: gitaly_replace_wiki_update_page -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83833 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357246 -milestone: '14.10' -type: undefined -group: group::editor -default_enabled: false |