From 191bed1dee1a1a84943a9d6e5de605fb895cd2dd Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Mon, 28 Aug 2017 14:35:05 +0000 Subject: Merge branch '36061-mr-ref' into 'master' Instrument MergeRequest#ensure_ref_fetched See merge request !13876 --- changelogs/unreleased/36061-mr-ref.yml | 5 +++++ config/initializers/8_metrics.rb | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 changelogs/unreleased/36061-mr-ref.yml diff --git a/changelogs/unreleased/36061-mr-ref.yml b/changelogs/unreleased/36061-mr-ref.yml new file mode 100644 index 00000000000..039666070a7 --- /dev/null +++ b/changelogs/unreleased/36061-mr-ref.yml @@ -0,0 +1,5 @@ +--- +title: Instrument MergeRequest#ensure_ref_fetched +merge_request: +author: +type: other diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index 2aeb94d47cd..370a976b64a 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -119,6 +119,9 @@ def instrument_classes(instrumentation) # Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/30224#note_32306159 instrumentation.instrument_instance_method(MergeRequestDiff, :load_commits) + + # Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/36061 + instrumentation.instrument_instance_method(MergeRequest, :ensure_ref_fetched) end # rubocop:enable Metrics/AbcSize -- cgit v1.2.3