summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormicael.bergeron <micaelbergeron@gmail.com>2017-11-06 09:23:41 -0500
committermicael.bergeron <micaelbergeron@gmail.com>2017-11-06 09:23:41 -0500
commit5ab3ed7a9ad16ad20fd3341a02b597697644ea3f (patch)
tree784608d2c6a57ab8ef02edb66e6ef42974da29a0
parentbb0543ef4782febe4dd0f26fc8a476b743fb86ca (diff)
downloadgitlab-ce-5ab3ed7a9ad16ad20fd3341a02b597697644ea3f.tar.gz
align with the comments
-rw-r--r--config/initializers/8_metrics.rb3
-rw-r--r--spec/models/merge_request_spec.rb2
2 files changed, 1 insertions, 4 deletions
diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb
index 4fa72a494d0..efa4d870e58 100644
--- a/config/initializers/8_metrics.rb
+++ b/config/initializers/8_metrics.rb
@@ -116,9 +116,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, :fetch_ref!)
end
# rubocop:enable Metrics/AbcSize
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index f719ee26767..d022dae3476 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1756,7 +1756,7 @@ describe MergeRequest do
end
describe '#fetch_ref!' do
- it 'fetch the ref correctly' do
+ it 'fetches the ref correctly' do
expect { subject.target_project.repository.delete_refs(subject.ref_path) }.not_to raise_error
subject.fetch_ref!