Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-09-01 12:08:30 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2017-09-01 23:12:16 +0300
commit89e2feab0a6f33b0da7b0d868a22082c7643bc3e (patch)
treef9659650c70f365a56ba75d5c39330a78935f299
parent60114c96e70854c1ce2f9cee973e3b5e18da64a4 (diff)
Merge branch '36061-mr-ref-instrument' into 'master'
Instrument MergeRequest#fetch_ref See merge request !13980
-rw-r--r--changelogs/unreleased/36061-mr-ref-instrument.yml5
-rw-r--r--config/initializers/8_metrics.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/36061-mr-ref-instrument.yml b/changelogs/unreleased/36061-mr-ref-instrument.yml
new file mode 100644
index 00000000000..b34eed43172
--- /dev/null
+++ b/changelogs/unreleased/36061-mr-ref-instrument.yml
@@ -0,0 +1,5 @@
+---
+title: Instrument MergeRequest#fetch_ref
+merge_request:
+author:
+type: other
diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb
index 370a976b64a..5b455a8065a 100644
--- a/config/initializers/8_metrics.rb
+++ b/config/initializers/8_metrics.rb
@@ -122,6 +122,7 @@ def instrument_classes(instrumentation)
# Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/36061
instrumentation.instrument_instance_method(MergeRequest, :ensure_ref_fetched)
+ instrumentation.instrument_instance_method(MergeRequest, :fetch_ref)
end
# rubocop:enable Metrics/AbcSize