diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-07 00:09:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-07 00:09:01 +0300 |
| commit | ca3ff7f842fb1e4bf124356a6faccd3e65b7aba3 (patch) | |
| tree | befb345c84e172b0592378ca17298f7a0c955a06 /config | |
| parent | 1287690a3678ad0ec21c9b2f3b21ae18257d5e22 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/feature_flags/development/approval_rules_eligible_filter.yml (renamed from config/feature_flags/development/pages_lets_encrypt_ecdsa.yml) | 10 | ||||
| -rw-r--r-- | config/feature_flags/development/secure_files_metadata_parsers.yml | 8 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
4 files changed, 17 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb index 0ed3e6fbd2d..d45e0bab54d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -294,6 +294,7 @@ module Gitlab config.assets.precompile << "page_bundles/milestone.css" config.assets.precompile << "page_bundles/new_namespace.css" config.assets.precompile << "page_bundles/oncall_schedules.css" + config.assets.precompile << "page_bundles/operations.css" config.assets.precompile << "page_bundles/escalation_policies.css" config.assets.precompile << "page_bundles/pipeline.css" config.assets.precompile << "page_bundles/pipeline_schedules.css" @@ -306,6 +307,7 @@ module Gitlab config.assets.precompile << "page_bundles/project.css" config.assets.precompile << "page_bundles/projects_edit.css" config.assets.precompile << "page_bundles/prometheus.css" + config.assets.precompile << "page_bundles/releases.css" config.assets.precompile << "page_bundles/reports.css" config.assets.precompile << "page_bundles/roadmap.css" config.assets.precompile << "page_bundles/requirements.css" diff --git a/config/feature_flags/development/pages_lets_encrypt_ecdsa.yml b/config/feature_flags/development/approval_rules_eligible_filter.yml index 866c2438e9f..e8d925d08a7 100644 --- a/config/feature_flags/development/pages_lets_encrypt_ecdsa.yml +++ b/config/feature_flags/development/approval_rules_eligible_filter.yml @@ -1,8 +1,8 @@ --- -name: pages_lets_encrypt_ecdsa -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88125 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363026 -milestone: '15.1' +name: approval_rules_eligible_filter +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100192 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376331 +milestone: '15.5' type: development -group: group::editor +group: group::source code default_enabled: false diff --git a/config/feature_flags/development/secure_files_metadata_parsers.yml b/config/feature_flags/development/secure_files_metadata_parsers.yml new file mode 100644 index 00000000000..2d6eed27f4b --- /dev/null +++ b/config/feature_flags/development/secure_files_metadata_parsers.yml @@ -0,0 +1,8 @@ +--- +name: secure_files_metadata_parsers +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99046 +rollout_issue_url: +milestone: '15.5' +type: development +group: group::incubation +default_enabled: false diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 0e8f5d4a7d6..aff05cb62b9 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -93,6 +93,8 @@ - 1 - - ci_job_artifacts_expire_project_build_artifacts - 1 +- - ci_parse_secure_file_metadata + - 1 - - ci_runners_process_runner_version_update - 1 - - ci_upstream_projects_subscriptions_cleanup |