BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a6582d24
Commit
a6582d24
authored
Jun 15, 2017
by
Sean McGivern
Committed by
Clement Ho
Jun 15, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'instrument-merge-request-diff-load-commits' into 'master'
Instrument MergeRequestDiff#load_commits See merge request !12162
parent
c46a92a9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
instrument-merge-request-diff-load-commits.yml
...unreleased/instrument-merge-request-diff-load-commits.yml
+4
-0
8_metrics.rb
config/initializers/8_metrics.rb
+3
-0
8_metrics_spec.rb
spec/initializers/8_metrics_spec.rb
+1
-0
No files found.
changelogs/unreleased/instrument-merge-request-diff-load-commits.yml
0 → 100644
View file @
a6582d24
---
title
:
Instrument MergeRequestDiff#load_commits
merge_request
:
author
:
config/initializers/8_metrics.rb
View file @
a6582d24
...
...
@@ -113,6 +113,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/30224#note_32306159
instrumentation
.
instrument_instance_method
(
MergeRequestDiff
,
:load_commits
)
end
# rubocop:enable Metrics/AbcSize
...
...
spec/initializers/8_metrics_spec.rb
View file @
a6582d24
...
...
@@ -7,6 +7,7 @@ describe 'instrument_classes', lib: true do
before
do
allow
(
config
).
to
receive
(
:instrument_method
)
allow
(
config
).
to
receive
(
:instrument_methods
)
allow
(
config
).
to
receive
(
:instrument_instance_method
)
allow
(
config
).
to
receive
(
:instrument_instance_methods
)
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment