diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/models/pages_deployment.rb | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/models/pages_deployment.rb')
-rw-r--r-- | app/models/pages_deployment.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/models/pages_deployment.rb b/app/models/pages_deployment.rb index 294a4e85d1f..da6ef035c54 100644 --- a/app/models/pages_deployment.rb +++ b/app/models/pages_deployment.rb @@ -16,6 +16,7 @@ class PagesDeployment < ApplicationRecord scope :migrated_from_legacy_storage, -> { where(file: MIGRATED_FILE_NAME) } scope :with_files_stored_locally, -> { where(file_store: ::ObjectStorage::Store::LOCAL) } scope :with_files_stored_remotely, -> { where(file_store: ::ObjectStorage::Store::REMOTE) } + scope :project_id_in, ->(ids) { where(project_id: ids) } validates :file, presence: true validates :file_store, presence: true, inclusion: { in: ObjectStorage::SUPPORTED_STORES } @@ -27,10 +28,6 @@ class PagesDeployment < ApplicationRecord mount_file_store_uploader ::Pages::DeploymentUploader - def log_geo_deleted_event - # this is to be adressed in https://gitlab.com/groups/gitlab-org/-/epics/589 - end - def migrated? file.filename == MIGRATED_FILE_NAME end @@ -41,3 +38,5 @@ class PagesDeployment < ApplicationRecord self.size = file.size end end + +PagesDeployment.prepend_mod |