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
d4dfa342
Commit
d4dfa342
authored
Feb 15, 2018
by
James Edwards-Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid slow File Lock checks when not used
Also avoid double commit lookup during file lock check by reusing memoized commits.
parent
f7c662c7
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
change_access.rb
lib/gitlab/checks/change_access.rb
+6
-1
commit_check.rb
lib/gitlab/checks/commit_check.rb
+2
-2
change_access_spec.rb
spec/lib/gitlab/checks/change_access_spec.rb
+2
-2
No files found.
lib/gitlab/checks/change_access.rb
View file @
d4dfa342
...
...
@@ -120,6 +120,7 @@ module Gitlab
def
commits_check
return
if
deletion?
||
newrev
.
nil?
return
unless
should_run_commit_validations?
# n+1: https://gitlab.com/gitlab-org/gitlab-ee/issues/3593
::
Gitlab
::
GitalyClient
.
allow_n_plus_1_calls
do
...
...
@@ -138,6 +139,10 @@ module Gitlab
private
def
should_run_commit_validations?
commit_check
.
validate_lfs_file_locks?
end
def
updated_from_web?
protocol
==
'web'
end
...
...
@@ -175,7 +180,7 @@ module Gitlab
end
def
commits
project
.
repository
.
new_commits
(
newrev
)
@commits
||=
project
.
repository
.
new_commits
(
newrev
)
end
end
end
...
...
lib/gitlab/checks/commit_check.rb
View file @
d4dfa342
...
...
@@ -35,14 +35,14 @@ module Gitlab
end
end
private
def
validate_lfs_file_locks?
strong_memoize
(
:validate_lfs_file_locks
)
do
project
.
lfs_enabled?
&&
project
.
lfs_file_locks
.
any?
&&
newrev
&&
oldrev
end
end
private
def
lfs_file_locks_validation
lambda
do
|
paths
|
lfs_lock
=
project
.
lfs_file_locks
.
where
(
path:
paths
).
where
.
not
(
user_id:
user
.
id
).
first
...
...
spec/lib/gitlab/checks/change_access_spec.rb
View file @
d4dfa342
...
...
@@ -190,7 +190,7 @@ describe Gitlab::Checks::ChangeAccess do
context
'with LFS not enabled'
do
it
'skips the validation'
do
expect_any_instance_of
(
described_class
).
not_to
receive
(
:lfs_file_locks_validation
)
expect_any_instance_of
(
Gitlab
::
Checks
::
CommitCheck
).
not_to
receive
(
:validate
)
subject
.
exec
end
...
...
@@ -207,7 +207,7 @@ describe Gitlab::Checks::ChangeAccess do
end
end
context
'when change is sent by the author o
d
the lock'
do
context
'when change is sent by the author o
f
the lock'
do
let
(
:user
)
{
owner
}
it
"doesn't raise any error"
do
...
...
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