Merge branch '36061-mr-ref' into 'master'

Instrument MergeRequest#ensure_ref_fetched See merge request !13876

Merge branch '36061-mr-ref' into 'master'
191bed1d · Sean McGivern · Jose Ivan Vargas · 77f04846 · 191bed1d · 191bed1d
Commit 191bed1d authored Aug 28, 2017 by Sean McGivern Committed by Jose Ivan Vargas Sep 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

36061-mr-ref.yml changelogs/unreleased/36061-mr-ref.yml +5 -0

8_metrics.rb config/initializers/8_metrics.rb +3 -0

No files found.
--- a/changelogs/unreleased/36061-mr-ref.yml
+++ b/changelogs/unreleased/36061-mr-ref.yml
+---
+title: Instrument MergeRequest#ensure_ref_fetched
+merge_request:
+author:
+type: other
--- 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