diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-09-13 11:11:15 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-09-13 11:11:15 +0000 |
| commit | a0c46221626ae367c3da68e38a6d5dde7dda32db (patch) | |
| tree | af8e9a58060973e88f49d045191134be95a04d34 | |
| parent | d77dc5843e2fdf46522113f51c8c49e6cff5225b (diff) | |
| parent | 41c08c93bca20c4e25797d61d697fdac71881600 (diff) | |
| download | gitlab-ce-a0c46221626ae367c3da68e38a6d5dde7dda32db.tar.gz | |
Merge branch '22053-gitlab-checks-metrics' into 'master'
Gitlab::Checks is now instrumented
See merge request !6318
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/initializers/metrics.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8ccb586f6e8..195362046dc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -97,6 +97,7 @@ v 8.12.0 (unreleased) - Fix spacing and vertical alignment on build status icon on commits page (ClemMakesApps) - Update merge_requests.md with a simpler way to check out a merge request. !5944 - Fix button missing type (ClemMakesApps) + - Gitlab::Checks is now instrumented - Move to project dropdown with infinite scroll for better performance - Fix leaking of submit buttons outside the width of a main container !18731 (originally by @pavelloz) - Load branches asynchronously in Cherry Pick and Revert dialogs. diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 52522e099e7..be22085b0df 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -68,7 +68,8 @@ if Gitlab::Metrics.enabled? ['app', 'mailers', 'emails'] => ['app', 'mailers'], ['app', 'services', '**'] => ['app', 'services'], ['lib', 'gitlab', 'diff'] => ['lib'], - ['lib', 'gitlab', 'email', 'message'] => ['lib'] + ['lib', 'gitlab', 'email', 'message'] => ['lib'], + ['lib', 'gitlab', 'checks'] => ['lib'] } paths_to_instrument.each do |(path, prefix)| |