summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-14 21:08:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-14 21:08:38 +0000
commit5c635722c66a32e170c3ba8150bc303124abb7a1 (patch)
treef2cc9bfbb258f98dddc871502988870b03d847e1 /config
parent93960490b8bdbc0f2ab1d102b83ec5d5b87c97a6 (diff)
downloadgitlab-ce-5c635722c66a32e170c3ba8150bc303124abb7a1.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/development/one_dimensional_matrix.yml2
-rw-r--r--config/feature_flags/development/push_mirror_syncs_lfs.yml7
2 files changed, 1 insertions, 8 deletions
diff --git a/config/feature_flags/development/one_dimensional_matrix.yml b/config/feature_flags/development/one_dimensional_matrix.yml
index a0eb4fe9e7d..1db16474d38 100644
--- a/config/feature_flags/development/one_dimensional_matrix.yml
+++ b/config/feature_flags/development/one_dimensional_matrix.yml
@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42170
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/256062
type: development
group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/push_mirror_syncs_lfs.yml b/config/feature_flags/development/push_mirror_syncs_lfs.yml
deleted file mode 100644
index d78fe679baa..00000000000
--- a/config/feature_flags/development/push_mirror_syncs_lfs.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: push_mirror_syncs_lfs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40137
-rollout_issue_url:
-group: group::source code
-type: development
-default_enabled: false