diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-25 11:12:36 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-25 11:12:36 +0000 |
| commit | bd13978c71a2bcc803135c0c0a0f1e5cd3e70c18 (patch) | |
| tree | 64dfb2749787b11c9c18d0ccea3d526ce32fbf7f | |
| parent | b53d6e558127a43e40716213f14eda6d9efb1a01 (diff) | |
| parent | 4236c2f055000ae9eadc165eea6355cf4825d595 (diff) | |
| download | gitlab-ce-bd13978c71a2bcc803135c0c0a0f1e5cd3e70c18.tar.gz | |
Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'
Adds link_to_gfm method instrumentation
See merge request !13069
| -rw-r--r-- | changelogs/unreleased/add-instrumentation-to-link-to-gfm.yml | 4 | ||||
| -rw-r--r-- | config/initializers/8_metrics.rb | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/add-instrumentation-to-link-to-gfm.yml b/changelogs/unreleased/add-instrumentation-to-link-to-gfm.yml new file mode 100644 index 00000000000..b5cf521561a --- /dev/null +++ b/changelogs/unreleased/add-instrumentation-to-link-to-gfm.yml @@ -0,0 +1,4 @@ +--- +title: Add instrumentation to MarkupHelper#link_to_gfm +merge_request: 13069 +author: diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index 25630b298ce..2aeb94d47cd 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -114,6 +114,9 @@ def instrument_classes(instrumentation) # This is a Rails scope so we have to instrument it manually. instrumentation.instrument_method(Project, :visible_to_user) + # Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/34509 + instrumentation.instrument_method(MarkupHelper, :link_to_gfm) + # Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/30224#note_32306159 instrumentation.instrument_instance_method(MergeRequestDiff, :load_commits) end |