diff options
author | Phil Hughes <me@iamphill.com> | 2018-02-19 15:54:01 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-02-19 15:54:01 +0000 |
commit | 0f5b56f96151b47957e7c497d44f983a23863086 (patch) | |
tree | 4db39f420153447ef7a2554d6fc406ce09aedb17 /lib/gitlab/checks/commit_check.rb | |
parent | 704ec01955e98c9098e5e57c2d0cb0c2493af5ad (diff) | |
parent | fb2a76ac484f5bba305abdf7b54a18ee8133f63f (diff) | |
download | gitlab-ce-0f5b56f96151b47957e7c497d44f983a23863086.tar.gz |
Merge branch 'master' into ph-dispatcher-cleanupph-dispatcher-cleanup
Diffstat (limited to 'lib/gitlab/checks/commit_check.rb')
-rw-r--r-- | lib/gitlab/checks/commit_check.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/checks/commit_check.rb b/lib/gitlab/checks/commit_check.rb index ae0cd142378..43a52b493bb 100644 --- a/lib/gitlab/checks/commit_check.rb +++ b/lib/gitlab/checks/commit_check.rb @@ -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 |