diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-15 18:08:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-15 18:08:43 +0000 |
| commit | 316fbf9f95dcdd16775f0339415572c3195eea92 (patch) | |
| tree | 40d86a896fc0ff8ce22fbed7e5e3dffc2adceebf /config | |
| parent | d9e71b0d412fb9d2d7fc8b00dddac21617eaaf19 (diff) | |
| download | gitlab-ce-316fbf9f95dcdd16775f0339415572c3195eea92.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_categories.yml | 2 | ||||
| -rw-r--r-- | config/feature_flags/development/security_auto_fix.yml | 7 | ||||
| -rw-r--r-- | config/feature_flags/development/show_inherited_labels.yml | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 97ba7586598..edf7bba27a3 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -49,7 +49,7 @@ - error_tracking - feature_flags - foundations -- fuzz-testing +- fuzz_testing - gdk - geo_replication - git_lfs diff --git a/config/feature_flags/development/security_auto_fix.yml b/config/feature_flags/development/security_auto_fix.yml new file mode 100644 index 00000000000..b97220a1059 --- /dev/null +++ b/config/feature_flags/development/security_auto_fix.yml @@ -0,0 +1,7 @@ +--- +name: security_auto_fix +introduced_by_url: +rollout_issue_url: +group: group::composition analysis +type: development +default_enabled: false diff --git a/config/feature_flags/development/show_inherited_labels.yml b/config/feature_flags/development/show_inherited_labels.yml index 3fb26d91227..73ceb07002c 100644 --- a/config/feature_flags/development/show_inherited_labels.yml +++ b/config/feature_flags/development/show_inherited_labels.yml @@ -1,7 +1,7 @@ --- name: show_inherited_labels introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42960 -rollout_issue_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267547 group: group::project management type: development -default_enabled: false +default_enabled: true |