diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-06 17:10:18 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-06 17:10:18 +0000 |
| commit | 045795d0d93dfe426cac668d612aa031114df930 (patch) | |
| tree | 3a6a1203301ad99af0adac293db5a822bbfe5b27 /config/initializers/8_metrics.rb | |
| parent | 2ea90ffcf1917158d6590999fbee03216ea9bc8c (diff) | |
| parent | d934d6504a9f1a706dbfc0b4a28c4cf8dbe8c8eb (diff) | |
| download | gitlab-ce-045795d0d93dfe426cac668d612aa031114df930.tar.gz | |
Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'
removed the #ensure_ref_fetched from all controllers
Closes #36061
See merge request gitlab-org/gitlab-ce!15129
Diffstat (limited to 'config/initializers/8_metrics.rb')
| -rw-r--r-- | config/initializers/8_metrics.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index dc242c747b9..9c53a33d245 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -115,10 +115,6 @@ 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) - instrumentation.instrument_instance_method(MergeRequest, :fetch_ref) end # rubocop:enable Metrics/AbcSize |