diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-25 11:12:36 +0000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-07-27 11:18:36 +1000 |
| commit | 484ddab96822e8183d8787c2e0b59beaa86d7df9 (patch) | |
| tree | c10fa1d8839b3c9937f1c718e6e1d91d7c504fe1 | |
| parent | 58a476c8052bbb0d78f872ae387909be4394f590 (diff) | |
| download | gitlab-ce-484ddab96822e8183d8787c2e0b59beaa86d7df9.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 c80d28746d6..5ab15f45ed2 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 |