summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-09-01 11:39:37 +0100
committerAlfredo Sumaran <alfredo@gitlab.com>2016-10-13 14:16:34 -0500
commit5c5259335f8bcc4de117c1e36648a269911281fb (patch)
treeaf68156b67150058e87fa3d81ce4a056e3035021 /config
parent6059ca02d9224d3670b1e02c71730f436b52cca4 (diff)
downloadgitlab-ce-5c5259335f8bcc4de117c1e36648a269911281fb.tar.gz
Add instrumentation to conflict classes
Diffstat (limited to 'config')
-rw-r--r--config/initializers/metrics.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index be22085b0df..3b8771543e4 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -67,6 +67,7 @@ if Gitlab::Metrics.enabled?
['app', 'finders'] => ['app', 'finders'],
['app', 'mailers', 'emails'] => ['app', 'mailers'],
['app', 'services', '**'] => ['app', 'services'],
+ ['lib', 'gitlab', 'conflicts'] => ['lib'],
['lib', 'gitlab', 'diff'] => ['lib'],
['lib', 'gitlab', 'email', 'message'] => ['lib'],
['lib', 'gitlab', 'checks'] => ['lib']