Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-13 16:26:31 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-13 16:26:31 +0300
commitb7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch)
tree5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /app/services/lfs
parent25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/lfs')
-rw-r--r--app/services/lfs/lock_file_service.rb2
-rw-r--r--app/services/lfs/unlock_file_service.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/app/services/lfs/lock_file_service.rb b/app/services/lfs/lock_file_service.rb
index c7730d24bdc..383a0d6b4e3 100644
--- a/app/services/lfs/lock_file_service.rb
+++ b/app/services/lfs/lock_file_service.rb
@@ -41,3 +41,5 @@ module Lfs
end
end
end
+
+Lfs::LockFileService.prepend_if_ee('EE::Lfs::LockFileService')
diff --git a/app/services/lfs/unlock_file_service.rb b/app/services/lfs/unlock_file_service.rb
index a42916d86bb..ea5a67b727f 100644
--- a/app/services/lfs/unlock_file_service.rb
+++ b/app/services/lfs/unlock_file_service.rb
@@ -45,3 +45,5 @@ module Lfs
# rubocop: enable CodeReuse/ActiveRecord
end
end
+
+Lfs::UnlockFileService.prepend_if_ee('EE::Lfs::UnlockFileService')