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
5ab3ed7a
Commit
5ab3ed7a
authored
Nov 06, 2017
by
micael.bergeron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
align with the comments
parent
bb0543ef
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
8_metrics.rb
config/initializers/8_metrics.rb
+0
-3
merge_request_spec.rb
spec/models/merge_request_spec.rb
+1
-1
No files found.
config/initializers/8_metrics.rb
View file @
5ab3ed7a
...
...
@@ -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
...
...
spec/models/merge_request_spec.rb
View file @
5ab3ed7a
...
...
@@ -1756,7 +1756,7 @@ describe MergeRequest do
end
describe
'#fetch_ref!'
do
it
'fetch the ref correctly'
do
it
'fetch
es
the ref correctly'
do
expect
{
subject
.
target_project
.
repository
.
delete_refs
(
subject
.
ref_path
)
}.
not_to
raise_error
subject
.
fetch_ref!
...
...
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