diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 12:10:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 12:10:12 +0000 |
| commit | 154523302b10ab5aeb67bde861880a98e3f8117a (patch) | |
| tree | 3b399e7da80ccc47877c5b6e1491abdcf1019c1b /config | |
| parent | 018e39a9507cc12bee5c6a168641d9843c5a6419 (diff) | |
| download | gitlab-ce-154523302b10ab5aeb67bde861880a98e3f8117a.tar.gz | |
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/ci_config_visualization_tab.yml | 8 | ||||
| -rw-r--r-- | config/initializers/request_profiler.rb | 1 | ||||
| -rw-r--r-- | config/metrics/counts_all/20210216183248_pg_system_id.yml | 10 |
4 files changed, 8 insertions, 13 deletions
diff --git a/config/application.rb b/config/application.rb index b9792cba793..5e24654434d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -173,6 +173,8 @@ module Gitlab config.assets.paths << Gemojione.images_path config.assets.paths << "#{config.root}/vendor/assets/fonts" + config.assets.paths << "#{config.root}/vendor/speedscope" + config.assets.precompile << "application_utilities.css" config.assets.precompile << "application_utilities_dark.css" config.assets.precompile << "application_dark.css" diff --git a/config/feature_flags/development/ci_config_visualization_tab.yml b/config/feature_flags/development/ci_config_visualization_tab.yml deleted file mode 100644 index cdc7322b7fd..00000000000 --- a/config/feature_flags/development/ci_config_visualization_tab.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_config_visualization_tab -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48793 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290117 -milestone: '13.7' -type: development -group: group::pipeline authoring -default_enabled: true diff --git a/config/initializers/request_profiler.rb b/config/initializers/request_profiler.rb index 8e426772b9a..2eb9f53d2a3 100644 --- a/config/initializers/request_profiler.rb +++ b/config/initializers/request_profiler.rb @@ -2,4 +2,5 @@ Rails.application.configure do |config| config.middleware.use(Gitlab::RequestProfiler::Middleware) + config.middleware.use(Gitlab::Middleware::Speedscope) end diff --git a/config/metrics/counts_all/20210216183248_pg_system_id.yml b/config/metrics/counts_all/20210216183248_pg_system_id.yml index 72d97c5db54..0fd54f58567 100644 --- a/config/metrics/counts_all/20210216183248_pg_system_id.yml +++ b/config/metrics/counts_all/20210216183248_pg_system_id.yml @@ -1,10 +1,10 @@ --- key_path: database.pg_system_id -description: '' -product_section: '' -product_stage: '' -product_group: '' -product_category: '' +description: TBD +product_section: enablement +product_stage: enablement +product_group: group::distribution +product_category: value_type: number status: data_available time_frame: all |