Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2c98733c
Commit
2c98733c
authored
Jul 25, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
9556829b
90b4a8e3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
11 deletions
+3
-11
.rubocop_todo.yml
.rubocop_todo.yml
+0
-8
app/models/commit.rb
app/models/commit.rb
+1
-1
db/migrate/20190222051615_add_indexes_for_merge_request_diffs_query.rb
...190222051615_add_indexes_for_merge_request_diffs_query.rb
+1
-1
lib/gitlab/profiler.rb
lib/gitlab/profiler.rb
+1
-1
No files found.
.rubocop_todo.yml
View file @
2c98733c
...
@@ -262,14 +262,6 @@ Naming/HeredocDelimiterNaming:
...
@@ -262,14 +262,6 @@ Naming/HeredocDelimiterNaming:
Naming/RescuedExceptionsVariableName
:
Naming/RescuedExceptionsVariableName
:
Enabled
:
false
Enabled
:
false
# Offense count: 3
# Cop supports --auto-correct.
Performance/ReverseEach
:
Exclude
:
-
'
app/models/commit.rb'
-
'
db/migrate/20190222051615_add_indexes_for_merge_request_diffs_query.rb'
-
'
lib/gitlab/profiler.rb'
# Offense count: 7081
# Offense count: 7081
# Configuration parameters: Prefixes.
# Configuration parameters: Prefixes.
# Prefixes: when, with, without
# Prefixes: when, with, without
...
...
app/models/commit.rb
View file @
2c98733c
...
@@ -346,7 +346,7 @@ class Commit
...
@@ -346,7 +346,7 @@ class Commit
if
commits_in_merge_request
.
present?
if
commits_in_merge_request
.
present?
message_body
<<
""
message_body
<<
""
commits_in_merge_request
.
reverse
.
each
do
|
commit_in_merge
|
commits_in_merge_request
.
reverse
_
each
do
|
commit_in_merge
|
message_body
<<
"
#{
commit_in_merge
.
short_id
}
#{
commit_in_merge
.
title
}
"
message_body
<<
"
#{
commit_in_merge
.
short_id
}
#{
commit_in_merge
.
title
}
"
end
end
end
end
...
...
db/migrate/20190222051615_add_indexes_for_merge_request_diffs_query.rb
View file @
2c98733c
...
@@ -35,7 +35,7 @@ class AddIndexesForMergeRequestDiffsQuery < ActiveRecord::Migration[5.0]
...
@@ -35,7 +35,7 @@ class AddIndexesForMergeRequestDiffsQuery < ActiveRecord::Migration[5.0]
end
end
def
down
def
down
INDEX_SPECS
.
reverse
.
each
do
|
spec
|
INDEX_SPECS
.
reverse
_
each
do
|
spec
|
remove_concurrent_index
(
*
spec
)
remove_concurrent_index
(
*
spec
)
end
end
end
end
...
...
lib/gitlab/profiler.rb
View file @
2c98733c
...
@@ -166,7 +166,7 @@ module Gitlab
...
@@ -166,7 +166,7 @@ module Gitlab
[
model
,
times
.
count
,
times
.
sum
]
[
model
,
times
.
count
,
times
.
sum
]
end
end
summarised_load_times
.
sort_by
(
&
:last
).
reverse
.
each
do
|
(
model
,
query_count
,
time
)
|
summarised_load_times
.
sort_by
(
&
:last
).
reverse
_
each
do
|
(
model
,
query_count
,
time
)
|
logger
.
info
(
"
#{
model
}
total (
#{
query_count
}
):
#{
time
.
round
(
2
)
}
ms"
)
logger
.
info
(
"
#{
model
}
total (
#{
query_count
}
):
#{
time
.
round
(
2
)
}
ms"
)
end
end
end
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