diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-28 14:35:05 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-28 14:35:05 +0000 |
| commit | 7ccef75a26bc4997e04c109007e6c6ee004574cb (patch) | |
| tree | ae474f0addc4e48c5bb2461fba050def8d195afd | |
| parent | 7dbb86783d785d4ba2b5cf97eb88653fd9197e3c (diff) | |
| parent | 7ba19ab620f5e89a6ff15df8603b315cd154bc6c (diff) | |
| download | gitlab-ce-7ccef75a26bc4997e04c109007e6c6ee004574cb.tar.gz | |
Merge branch '36061-mr-ref' into 'master'
Instrument MergeRequest#ensure_ref_fetched
See merge request !13876
| -rw-r--r-- | changelogs/unreleased/36061-mr-ref.yml | 5 | ||||
| -rw-r--r-- | config/initializers/8_metrics.rb | 3 |
2 files changed, 8 insertions, 0 deletions
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 |